1、优化旧平台用户同步逻辑

2、解决人才地图，没有匹配数据还会返回的问题

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/MdeOldSyncService.java

@@ -222,7 +222,7 @@ public class MdeOldSyncService {
             MdeUserDO userDO = mdeUserMapper.selectOne(MdeUserDO::getId, oldMdeUser.getUserCode());
 
             MdeUserDO insertionDO = MdeUserDO.builder()
-                    .id(oldMdeUser.getUserCode())
+                    .id(null == userDO ? oldMdeUser.getUserCode() : userDO.getId())
                     .username(oldMdeUser.getIdentityFlag().equals("0") ? oldMdeUser.getUserName() : oldMdeUser.getEntPhone())
                     // 重置密码手机号后6位
                     .password(passwordEncoder.encode("147258369"))
@@ -241,8 +241,6 @@ public class MdeOldSyncService {
                     .userId(oldMdeUser.getUserCode())
                     .name(oldMdeUser.getName())
                     .foreignName(oldMdeUser.getForeignName())
-                    // 有座机，大坑
-                    .phone(oldMdeUser.getUserName().contains("+") ? null : oldMdeUser.getUserName())
                     .email(oldMdeUser.getEmail())
                     .firstWorkTime(null == oldMdeUser.getFirstWork() ? null : oldMdeUser.getFirstWork().atStartOfDay())
                     .jobStatus(oldMdeUser.getWorkStatus())
@@ -253,11 +251,9 @@ public class MdeOldSyncService {
 
             if (oldMdeUser.getIdentityFlag().equals("0")) {
                 // 个人
-                personInfoDO.setPhone(oldMdeUser.getUserName().contains("+") ? null : oldMdeUser.getUserName());
                 insertionDO.setPhone(oldMdeUser.getUserName().contains("+") ? null : oldMdeUser.getUserName());
             } else {
                 // 企业
-                personInfoDO.setPhone(oldMdeUser.getEntPhone());
                 insertionDO.setPhone(oldMdeUser.getEntPhone());
             }
 
@@ -269,9 +265,6 @@ public class MdeOldSyncService {
             setCommon(personInfoDO);
             personInfoMapper.insertOrUpdate(personInfoDO);
 
-            if (null != userDO) {
-                return;
-            }
             setCommon(insertionDO);
             mdeUserMapper.insertOrUpdate(insertionDO);
         });

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonIntegrationServiceImpl.java

@@ -207,6 +207,9 @@ public class PersonIntegrationServiceImpl implements PersonIntegrationService {
             }
             ids = graphApi.query(condition).getCheckedData();
         }
+        if(null == ids|| ids.length == 0) {
+            return null;
+        }
 
         return personInfoMapper.queryPage(reqVO, ids);
     }