Procházet zdrojové kódy

feat: UN-71: 奖金管理-封期管理:结算按钮规则调整.

kevin před 1 rokem
rodič
revize
90045d8e71

+ 1 - 1
backendApi/modules/v1/controllers/BonusController.php

@@ -99,7 +99,7 @@ class BonusController extends BaseController {
 //        $condition .= ' AND PERIOD_NUM<=:PERIOD_NUM AND STATUS=1';
 //        $condition .= ' AND PERIOD_NUM<=:PERIOD_NUM AND STATUS=1';
         $condition .= ' AND IS_SENT=0 AND STATUS=1';
         $condition .= ' AND IS_SENT=0 AND STATUS=1';
 //        $params[':PERIOD_NUM'] = $nowPeriodNum;
 //        $params[':PERIOD_NUM'] = $nowPeriodNum;
-        $data = Period::lists($condition, $params, ['orderBy' => 'PERIOD_NUM DESC', 'limit' => 2]);
+        $data = Period::lists($condition, $params, ['orderBy' => 'PERIOD_NUM ASC', 'limit' => 2]);
         foreach ($data['list'] as $key => $value) {
         foreach ($data['list'] as $key => $value) {
             // 是否可结算
             // 是否可结算
             $data['list'][$key]['IS_CAN_CALC'] = $periodObj->isCanCalc($value['PERIOD_NUM']);
             $data['list'][$key]['IS_CAN_CALC'] = $periodObj->isCanCalc($value['PERIOD_NUM']);