|
|
@@ -335,9 +335,12 @@ class WorkClass extends BaseClass
|
|
|
{
|
|
|
$order = 'addTime DESC';
|
|
|
if (isset($where['status'])) {
|
|
|
- if ($where['status'] == 0 || $where['status'] == 1) {
|
|
|
+ if ($where['status'] == 0) {
|
|
|
$order = 'hasReachTime DESC,reachDate ASC,reachPeriod ASC,addTime DESC';
|
|
|
}
|
|
|
+ if ($where['status'] == 1) {
|
|
|
+ $order = 'hasReachTime DESC,reachDate DESC,reachPeriod ASC,addTime DESC';
|
|
|
+ }
|
|
|
}
|
|
|
$data = self::getList('*', $where, $order);
|
|
|
$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
|