同步钉钉通讯录，解决单个人员授权的情况下不能同步过来的问题

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

@@ -645,7 +645,7 @@ public class TaskController {
             return msg;
         }
         //查询直接子任务
-        QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id);
+        QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id).orderByAsc("end_date");
         t.setSubTaskList(taskService.list(subQuery));
 
         //查询最新的一条任务进展
@@ -707,13 +707,13 @@ public class TaskController {
         String userId = request.getHeader("Token");
 
         //查询直接子任务
-        QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id);
+        QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id).orderByAsc("end_date");
         msg.data = taskService.list(subQuery);
         return msg;
     }
 
     @RequestMapping("/getRecentTask")
-    public HttpRespMsg getRecentTask(Integer projectId, Integer groupId, Integer stage,
+    public HttpRespMsg getRecentTask(Integer projectId,
                                      @RequestParam(required = false, defaultValue = "0") Integer isSubstitude) {
         HttpRespMsg msg = new HttpRespMsg();
         String userId = request.getHeader("Token");

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

@@ -744,6 +744,9 @@ public class DingDingServiceImpl implements DingDingService {
                     user.setDepartmentId(department.getDepartmentId());
                     user.setDepartmentCascade(convertDepartmentIdToCascade(department.getDepartmentId()));
                     newUserList.add(user);
+                } else {
+                    //部门不存在，没有授权该部门， 只授权了人员，那就没有部门
+                    newUserList.add(user);
                 }
             } else {
                 //已存在，对比是否需要更新
@@ -1498,7 +1501,7 @@ public class DingDingServiceImpl implements DingDingService {
         req.setUserid(dingdingUserid);
         req.setLanguage("zh_CN");
         OapiV2UserGetResponse rsp = client.execute(req, access_token);
-//        System.out.println(rsp.getBody());
+        System.out.println(rsp.getBody());
         JSONObject resp = JSONObject.parseObject(rsp.getBody());
         if (resp.getInteger("errcode") == 0) {
             JSONObject userJson = resp.getJSONObject("result");