|
|
@@ -361,10 +361,10 @@ class WorkClass extends BaseClass
|
|
|
$order = 'addTime DESC';
|
|
|
if (isset($where['status'])) {
|
|
|
if ($where['status'] == 0) {
|
|
|
- $order = 'hasReachTime DESC,reachDate ASC,reachPeriod ASC,addTime DESC';
|
|
|
+ $order = 'hasReachTime DESC,reachDate ASC,reachPeriod ASC,addTime ASC';
|
|
|
}
|
|
|
if ($where['status'] == 1) {
|
|
|
- $order = 'hasReachTime DESC,reachDate DESC,reachPeriod DESC,addTime DESC';
|
|
|
+ $order = 'hasReachTime DESC,reachDate DESC,reachPeriod DESC,addTime ASC';
|
|
|
}
|
|
|
}
|
|
|
$data = self::getList('*', $where, $order);
|