修改本月统计

attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue

@@ -224,8 +224,8 @@ export default {
       console.log("isExport:",this.isExport)
 
       if(this.isExport==true) {
-        this.$message.warning("考勤数据正在导出中，请勿重复点击！")
-        return;
+        this.$message.info("考勤数据正在导出中，请勿重复点击！")
+        return false;
       }
 
       this.isExport = true;

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.dept.web;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
@@ -17,6 +18,7 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,7 +94,9 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
         String busiDesc = "查询" + this.getModuleDesc();
         int code = VALUE_RESULT_SUCCESS;
         try {
-            List<DeptEntity> list = this.service.find(new DeptQuery());
+            DeptQuery deptQuery = new DeptQuery();
+            deptQuery.setOrderColList(Arrays.asList(new OrderCol("deptName")));
+            List<DeptEntity> list = this.service.find(deptQuery);
             List<DeptTreeSelect> treeSelects = this.service.buildDeptTreeSelect(list);
             model.put("result", treeSelects);
             recordSysLog(request, busiDesc + " 【成功】");