合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!90

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java

@@ -159,6 +159,13 @@ public class SyncDataServiceImpl implements ISyncDataService{
         //people获取用户信息Map
         Map<String, PPEmployee> PPEmployeeMap=new HashMap<String,PPEmployee>();
 
+        //此处获取全部pp用户信息
+        List<SysUser> sysUserList = sysUserService.getPPEmployeeList();
+//            log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList));
+        for(SysUser user:sysUserList){
+            localUserMap.put(user.getThirdId(),user);
+        }
+
         String path = "/people/v1/employee/all-info";
         String queryStr = "app_id=" + appId + "&hash_type=sha256&offset=0&limit=100";
         String response = getResultDataOfGet(path, queryStr);
@@ -195,13 +202,8 @@ public class SyncDataServiceImpl implements ISyncDataService{
             }
             // 处理同步过来的数据id不同，username相同的情况 creation_time不能为空
 //            ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed());
+            ppEmployeeList = ppEmployeeList.stream().distinct().collect(Collectors.toList()); // 去重
 
-            //此处获取全部pp用户信息
-            List<SysUser> sysUserList = sysUserService.getPPEmployeeList();
-//            log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList));
-            for(SysUser user:sysUserList){
-                localUserMap.put(user.getThirdId(),user);
-            }
 //            log.info("将用户信息集合转换为的用户MAP为："+JSONObject.toJSONString(localUserMap));
             log.info("开始更新数据库信息");
             for(PPEmployee ppEmployee:ppEmployeeList){