1

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

@@ -690,22 +690,26 @@ public class FeishuInfoController {
                             Optional<Object> first = leaders.stream().filter(l -> ((JSONObject) l).getIntValue("leaderType") == 1).findFirst();
                             if(first.isPresent()){
                                 JSONObject firstOb = (JSONObject) first.get();
-                                Optional<User> leaderID = allUserList.stream().filter(ul -> ul.getFeishuUserid().equals(firstOb.getString("leaderID"))).findFirst();
-                                if(leaderID.isPresent()){
-                                    department.setManagerId(leaderID.get().getId());
+                                if(firstOb.getString("leaderID")!=null){
+                                    Optional<User> leaderID = allUserList.stream().filter(ul ->ul.getFeishuUserid()!=null&& ul.getFeishuUserid().equals(firstOb.getString("leaderID"))).findFirst();
+                                    if(leaderID.isPresent()){
+                                        department.setManagerId(leaderID.get().getId());
+                                    }
                                 }
                             }
                             //todo:处理次要负责人
                             List<Object> othObs = leaders.stream().filter(l -> ((JSONObject) l).getIntValue("leaderType") == 2).collect(Collectors.toList());
                             for (Object othOb : othObs) {
                                 JSONObject oth = (JSONObject) othOb;
-                                Optional<User> leaderID = allUserList.stream().filter(ul -> ul.getFeishuUserid().equals(oth.getString("leaderID"))).findFirst();
-                                if(leaderID.isPresent()){
-                                    DepartmentOtherManager departmentOtherManager=new DepartmentOtherManager();
-                                    departmentOtherManager.setCompanyId(feishuInfo.getCompanyId());
-                                    departmentOtherManager.setDepartmentId(department.getDepartmentId());
-                                    departmentOtherManager.setOtherManagerId(leaderID.get().getId());
-                                    odList.add(departmentOtherManager);
+                                if(oth.getString("leaderID")!=null){
+                                    Optional<User> leaderID = allUserList.stream().filter(ul ->ul.getFeishuUserid()!=null&&ul.getFeishuUserid().equals(oth.getString("leaderID"))).findFirst();
+                                    if(leaderID.isPresent()){
+                                        DepartmentOtherManager departmentOtherManager=new DepartmentOtherManager();
+                                        departmentOtherManager.setCompanyId(feishuInfo.getCompanyId());
+                                        departmentOtherManager.setDepartmentId(department.getDepartmentId());
+                                        departmentOtherManager.setOtherManagerId(leaderID.get().getId());
+                                        odList.add(departmentOtherManager);
+                                    }
                                 }
                             }
                         }