bugifx

backendApi/modules/v1/controllers/BonusController.php

@@ -975,8 +975,8 @@ class BonusController extends BaseController {
             $listObj = new PeriodBonusList();
             $data = $listObj->getList(['condition'=>$condition, 'params'=>$params, 'others'=>['yearMonth'=>$yearMonth]]);
         } catch (Exception $e) {
-            LoggerTool::info([$e->getFile(), $e->getLine(), $e->getMessage()]);
-            return null;
+//            LoggerTool::info([$e->getFile(), $e->getLine(), $e->getMessage()]);
+            return $data;
         }
 
         return $data;

backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -86,11 +86,11 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 ],
                 'CALCULATED_AT' => [
                     'header' => 'Date', // 结算时间
-//                    'value' => function($row) {
-//                        return (new DateTime([
-//                            'value' => $row['CALCULATED_AT'],
-//                        ]))->result();
-//                    },
+                    'value' => function($row) {
+                        return (new DateTime([
+                            'value' => $row['CALCULATED_AT'],
+                        ]))->result();
+                    },
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_USER_NAME' => [
@@ -143,11 +143,11 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 ],
                 'LAST_CREATED_AT' => [
                     'header' => 'Joining Date', // 加入时间
-//                    'value' => function($row) {
-//                        return (new DateTime([
-//                            'value' => $row['LAST_CREATED_AT'],
-//                        ]))->result();
-//                    },
+                    'value' => function($row) {
+                        return (new DateTime([
+                            'value' => $row['LAST_CREATED_AT'],
+                        ]))->result();
+                    },
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_REC_USER_NAME' => [