修改考勤汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformRulesController.java

@@ -65,7 +65,12 @@ public class PerformRulesController extends BaseCRUDJsonBodyMappingController<Pe
     @Override
     protected void doListBefore(PerformRulesEntity query, Map<String, Object> model, Context context) throws AppException {
         super.doListBefore(query, model, context);
-        query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+
     }
 
     @PostMapping({"summary"})
@@ -78,7 +83,7 @@ public class PerformRulesController extends BaseCRUDJsonBodyMappingController<Pe
 
         int code = 1;
         try {
-            Map<String,Object> result = this.getService().summaryRules();
+            Map<String, Object> result = this.getService().summaryRules();
             model.put("data", result);
             model.put("message_info", busiDesc + "成功");
             if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {