Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -2480,7 +2480,7 @@ public class WeiXinCorpController {
             //获取部门
             JSONObject deptObj = getAllDepartments(curCorpAccessToken);
             JSONArray deptObjJSONArray = deptObj.getJSONArray("department");
-
+            System.out.println("部门department===="+deptObjJSONArray);
             for (int i=0;i<deptObjJSONArray.size(); i++) {
                 int deptId = deptObjJSONArray.getJSONObject(i).getIntValue("id");
                 Department curDept = null;
@@ -2498,50 +2498,51 @@ public class WeiXinCorpController {
                         curDept = department;
                     } else {
                         //
-                        System.out.println("找到了已有部门== name=="+curDept.getDepartmentName());
+                        System.out.println("找到了已有部门== name==" + curDept.getDepartmentName());
                         if (parentId == 1) {
                             if (curDept.getSuperiorId() != null) {
                                 //变更到一级部门了,此处不依赖于其他部门是否存在，可以直接更新
                                 departmentMapper.updateNullSuperior(curDept.getDepartmentId());
                             }
                         } else {
-                            if (curDept.getCorpwxDeptpid() == null||curDept.getCorpwxDeptpid()!=parentId) {
+                            if (curDept.getCorpwxDeptpid() == null || curDept.getCorpwxDeptpid() != parentId) {
                                 //有父部门需要更新
                                 curDept.setCorpwxDeptpid(parentId);
                                 departmentMapper.updateById(curDept);
                             }
                         }
                     }
-                    //获取部门下的人员
-                    JSONArray userList = getDeptUserSimple(curCorpAccessToken, deptId);
-                    for (int m=0;m<userList.size(); m++) {
-                        JSONObject userJson = userList.getJSONObject(m);
-                        String curUserid = userJson.getString("userid");
-                        String openUserid = userJson.getString("open_userid");
-                        System.out.println("人员信息："+userJson.toString());
-                        //不存在的人员， 进行插入
-                        User user = new User();
-                        Optional<User> first = allCorpWxUserList.stream().filter(all -> all.getCorpwxUserid().equals(openUserid)).findFirst();
-                        if (first.isPresent()) {
-                            user = first.get();
-                            user.setCorpwxDeptid(deptId);
-                        } else {
-                            //在当前部门下的员工
-                            user.setId(SnowFlake.nextId()+"")
-                                    .setRoleId(defaultRole.getId())//默认普通员工
-                                    .setRoleName(defaultRole.getRolename())
-                                    .setCompanyId(companyId)
-                                    .setName(userJson.getString("name"))
-                                    .setCorpwxUserid(openUserid)
-                                    .setCorpwxRealUserid(curUserid)
-                                    .setColor(ColorUtil.randomColor())
-                                    .setJobNumber(openUserid.equals(curUserid)?null:curUserid)
-                                    .setPassword(MD5Util.getPassword("000000"))
-                                    .setCorpwxDeptid(curDept.getCorpwxDeptid());
-                            allCorpWxUserList.add(user);
-                        }
+                }
+                //获取部门下的人员,包括公司直属的人员
+                JSONArray userList = getDeptUserSimple(curCorpAccessToken, deptId);
+                for (int m=0;m<userList.size(); m++) {
+                    JSONObject userJson = userList.getJSONObject(m);
+                    String curUserid = userJson.getString("userid");
+                    String openUserid = userJson.getString("open_userid");
+                    System.out.println("人员信息："+userJson.toString());
+                    //不存在的人员， 进行插入
+                    User user = new User();
+                    Optional<User> first = allCorpWxUserList.stream().filter(all -> all.getCorpwxUserid().equals(openUserid)).findFirst();
+                    if (first.isPresent()) {
+                        user = first.get();
+                        user.setCorpwxDeptid(deptId);
+                    } else {
+                        //在当前部门下的员工
+                        user.setId(SnowFlake.nextId()+"")
+                                .setRoleId(defaultRole.getId())//默认普通员工
+                                .setRoleName(defaultRole.getRolename())
+                                .setCompanyId(companyId)
+                                .setName(userJson.getString("name"))
+                                .setCorpwxUserid(openUserid)
+                                .setCorpwxRealUserid(curUserid)
+                                .setColor(ColorUtil.randomColor())
+                                .setJobNumber(openUserid.equals(curUserid)?null:curUserid)
+                                .setPassword(MD5Util.getPassword("000000"))
+                                .setCorpwxDeptid(curDept==null?1:curDept.getCorpwxDeptid());//默认1属于公司下面
+                        allCorpWxUserList.add(user);
                     }
                 }
+
             }
             //更新部门层级关系
             updateDeptHierachyByCorpWx(companyId);
@@ -2582,6 +2583,7 @@ public class WeiXinCorpController {
                     return msg;
                 }else {
                     userService.saveBatch(newUserList);
+                    log.info("保存了新员工数据===>");
                     /*for (User user : newUserList) {
                         wxCorpInfoService.getUserByCompanyIdAndTransferLicense(companyId,user.getCorpwxUserid());
                     }*/