1、修改已知缺陷

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

@@ -188,12 +188,13 @@ public class MdeOldSyncService {
 
             MdeUserDO insertionDO = MdeUserDO.builder()
                     .id(oldMdeUser.getUserCode())
-                    .username(oldMdeUser.getUserName())
+                    .username(oldMdeUser.getIdentityFlag().equals("0")?oldMdeUser.getUserName():oldMdeUser.getEntPhone())
                     // 重置密码手机号后6位
                     .password(passwordEncoder.encode("123456"))
                     .email(oldMdeUser.getEmail())
                     // 有座机，大坑
-                    .phone(oldMdeUser.getUserName())
+                    // 个人用户getUserName是手机号，企业用户是邮箱，所以企业用户取getEntPhone
+                    .phone(oldMdeUser.getIdentityFlag().equals("0")?oldMdeUser.getUserName():oldMdeUser.getEntPhone())
                     .avatar(null==oldMdeUser.getHeadPortrait()?null:url + oldMdeUser.getHeadPortrait())
                     .status(MendunerStatusEnum.ENABLE.getStatus())
                     .build();
@@ -214,6 +215,17 @@ public class MdeOldSyncService {
                     .avatar(null==oldMdeUser.getHeadPortrait()?null:url + oldMdeUser.getHeadPortrait())
                     .build();
 
+
+            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());
+            }
+
             if (null != oldMdeUser.getBirthday()) {
                 personInfoDO.setBirthday(DateUtils.of(oldMdeUser.getBirthday(), FORMAT_YEAR_MONTH_DAY).atStartOfDay());
             }
@@ -309,6 +321,7 @@ public class MdeOldSyncService {
                     .expType(oldMdeJobAdvertised.getWorkExperience())
                     .payFrom(oldMdeJobAdvertised.getPayFrom())
                     .payTo(oldMdeJobAdvertised.getPayTo())
+                    .hire(false)
                     .status(oldMdeJobAdvertised.getJobStatus())
                     .build();
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/business/EnterpriseBusinessServiceImpl.java

@@ -118,7 +118,7 @@ public class EnterpriseBusinessServiceImpl implements EnterpriseBusinessService
         EnterpriseBusinessDO businessDO =
                 enterpriseBusinessMapper.selectByEnterpriseId(LoginUserContext.getEnterpriseId());
         if (null == businessDO) {
-            throw exception(MDE_ENTERPRISE_BUSINESS_NOT_EXISTS);
+           return null;
         }
         return businessDO;
     }