1.部门排序

2.提供saas_sync_contact字段

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/DepartmentController.java

@@ -45,10 +45,10 @@ public class DepartmentController {
      * @param request
      * @return
      */
-    @RequestMapping("/seqList")
-    public HttpRespMsg seqList(HttpServletRequest request,String list) {
+    @RequestMapping("/sortList")
+    public HttpRespMsg sortList(HttpServletRequest request,String list) {
         List<DepartmentVO> departmentVOS = JSONArray.parseArray(list, DepartmentVO.class);
-        return departmentService.seqList(request,departmentVOS);
+        return departmentService.sortList(request,departmentVOS);
     }
 
     @RequestMapping("/listAllMemb")

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TimeTypeController.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.TimeAutoExclude;
 import com.management.platform.entity.TimeType;
 import com.management.platform.entity.User;
+import com.management.platform.entity.WxCorpInfo;
 import com.management.platform.mapper.TimeAutoExcludeMapper;
 import com.management.platform.mapper.UserMapper;
+import com.management.platform.mapper.WxCorpInfoMapper;
 import com.management.platform.service.TimeTypeService;
 import com.management.platform.service.UserService;
 import com.management.platform.util.HttpRespMsg;
@@ -38,14 +40,20 @@ public class TimeTypeController {
     UserService userService;
     @Resource
     TimeAutoExcludeMapper timeAutoExcludeMapper;
+    @Resource
+    WxCorpInfoMapper wxCorpInfoMapper;
     @RequestMapping("/getCompanyTimeSetting")
     public HttpRespMsg get(Integer companyId) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId).eq("report_status", 1));
         TimeType timeType = timeTypeService.getById(companyId);
         List<TimeAutoExclude> excludeTimeList = timeAutoExcludeMapper.selectList(new QueryWrapper<TimeAutoExclude>().eq("company_id", companyId));
+        WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
         timeType.setUserList(userList);
         timeType.setExcludeTimeList(excludeTimeList);
+        if (wxCorpInfo!=null){
+            timeType.setSaasSyncContact(wxCorpInfo.getSaasSyncContact());
+        }
         httpRespMsg.data=timeType;
         return httpRespMsg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -57,6 +57,12 @@ public class TimeType extends Model<TimeType> {
     @TableField(exist = false)
     private List<TimeAutoExclude> excludeTimeList;
 
+    /**
+     * 是否自动同步企业微信通讯录
+     */
+    @TableField(exist = false)
+    private Integer saasSyncContact;
+
     /**
      * 每月工作天数
      */

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/DepartmentService.java

@@ -60,5 +60,5 @@ public interface DepartmentService extends IService<Department> {
 
     String exportWxDepartment(Department department,List<Department> departmentList);
 
-    HttpRespMsg seqList(HttpServletRequest request,List<DepartmentVO> list);
+    HttpRespMsg sortList(HttpServletRequest request,List<DepartmentVO> list);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -371,7 +371,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 fillSubDepartmentList(departmentList, rootDeptVO, departmentOtherManagerList);
             });
             //递归排序
-            seqResultDeptList(list);
+            sortResultDeptList(list);
             //返回数据
             httpRespMsg.data = list;
         } catch (NullPointerException e) {
@@ -511,6 +511,8 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 }
                 list.add(departmentMasterVO);
             }
+            //对部门排序
+            list.sort(Comparator.comparing(l->l.getSeq()));
             resultMap.put("totalCostMoney", totalCostMoney);
             resultMap.put("costList", list);
             if(functionCostList.size()==0){
@@ -1535,10 +1537,10 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
      * @return
      */
     @Override
-    public HttpRespMsg seqList(HttpServletRequest request, List<DepartmentVO> list) {
+    public HttpRespMsg sortList(HttpServletRequest request, List<DepartmentVO> list) {
         HttpRespMsg msg = new HttpRespMsg();
         ArrayList<Department> departments = new ArrayList<>();
-        seqDeptList(departments, list);
+        sortDeptList(departments, list);
         departmentService.updateBatchById(departments);
         return msg;
     }
@@ -1548,11 +1550,11 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
      * @param list
      * @return
      */
-    public List<DepartmentVO> seqResultDeptList(List<DepartmentVO> list){
+    public List<DepartmentVO> sortResultDeptList(List<DepartmentVO> list){
         list.sort(Comparator.comparing(dept->dept.getSeq()));
         for (DepartmentVO departmentVO : list) {
             if (departmentVO.getChildren()!=null){
-                seqResultDeptList(departmentVO.getChildren());
+                sortResultDeptList(departmentVO.getChildren());
             }
         }
         return list;
@@ -1562,7 +1564,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
      * 递归对DepartmentVO进行拆分排序
      * @return
      */
-    public List<Department> seqDeptList(ArrayList<Department> departments,List<DepartmentVO> list){
+    public List<Department> sortDeptList(ArrayList<Department> departments,List<DepartmentVO> list){
         Integer seq = 1;
         for (DepartmentVO departmentVO : list) {
             Department department = new Department();
@@ -1571,7 +1573,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
             seq++;
             departments.add(department);
             if (departmentVO.getChildren()!=null){
-                seqDeptList(departments,departmentVO.getChildren());
+                sortDeptList(departments,departmentVO.getChildren());
             }
         }
         return departments;