feat:先查看user是否存在再看手机号是否存在

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -56,6 +56,14 @@ public interface StaffApiService {
 	 */
 	StaffDTO selectByUserIdAndEnterpriseId(String userId, String wxEnterpriseId);
 
+	/**
+	 * 没手机号的时候需要重新刷
+	 * @param userId
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	StaffDTO getByUserIdAndReflushWhenNoPhone(String userId, String wxEnterpriseId);
+
 	StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
 
 	int countByDepartmentId(String departmentId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java

@@ -84,16 +84,21 @@ public class StaffServiceImpl implements StaffService {
         List<String> userIds=new ArrayList<>();
         userIds.add(userId);
         List<TabHaobanStaff> staffs = mapper.listByUserIdsAndWxEnterpriseId(userIds, wxEnterpriseId);
+        if (CollectionUtils.isEmpty(staffs)) {
+            return this.selectByPhoneNumberAndEnterpriseId(phoneNumber, wxEnterpriseId);
+        }
+        if (staffs.size()==1) {
+            return staffs.get(0);
             //需要去除多余的
-        if (CollectionUtils.isNotEmpty(staffs)&&staffs.size()>1) {
+        }else if (staffs.size()>1) {
             Map<String, TabHaobanStaff> staffMap = staffs.stream().collect(Collectors.toMap(dto -> dto.getStaffId(), dto -> dto,(o,n)->n));
             List<String> relationStaffIds = staffClerkRelationService.listRelationsStaffId(staffMap.keySet());
             if (CollectionUtils.isNotEmpty(relationStaffIds)) {
                 return staffMap.get(relationStaffIds.get(0));
             }
         }
+        return null;
 
-        return this.selectByPhoneNumberAndEnterpriseId(phoneNumber, wxEnterpriseId);
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -893,6 +893,36 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
+    public StaffDTO getByUserIdAndReflushWhenNoPhone(String userId, String wxEnterpriseId) {
+        StaffDTO staffDTO = EntityUtil.changeEntityByJSON(StaffDTO.class, staffService.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId));
+        if (staffDTO == null) {
+            return null;
+        }
+        if (StringUtils.isBlank(staffDTO.getPhoneNumber())) {
+            this.wxGetAdd(userId,wxEnterpriseId);
+            return EntityUtil.changeEntityByJSON(StaffDTO.class, staffService.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId));
+        }
+
+        //todo 历史数据 相同的id需要删除 后续这个逻辑可以删除
+        //存在多条
+        List<String> userIds=new ArrayList<>();
+        userIds.add(userId);
+        List<TabHaobanStaff> staffs = staffMapper.listByUserIdsAndWxEnterpriseId(userIds, wxEnterpriseId);
+        //需要去除多余的
+        if (CollectionUtils.isNotEmpty(staffs)&&staffs.size()>1) {
+            Map<String, TabHaobanStaff> staffMap = staffs.stream().collect(Collectors.toMap(dto -> dto.getStaffId(), dto -> dto,(o,n)->n));
+            List<String> relationStaffIds = staffClerkRelationService.listRelationsStaffId(staffMap.keySet());
+            if (CollectionUtils.isNotEmpty(relationStaffIds)) {
+                TabHaobanStaff staff = staffMap.get(relationStaffIds.get(0));
+                staffService.delOtherStaffByWxUserId(staff.getWxUserId(), staff.getStaffId(), wxEnterpriseId);
+            }
+            staffDTO = EntityUtil.changeEntityByJSON(StaffDTO.class, staffService.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId));
+
+        }
+        return staffDTO;
+    }
+
+    @Override
     public StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId) {
         TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedService.getDepartmentIdAndStaffId(departmentId, staffId);
         return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, tab);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -110,9 +110,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
         WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
         StaffDTO loginStaff = null;
         if (enterprise != null) {
-            loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());
+            loginStaff = staffApiService.getByUserIdAndReflushWhenNoPhone(userId, enterprise.getWxEnterpriseId());
         }
-        if (loginStaff == null) {
+        //手机号不存在
+        if (loginStaff == null|| StringUtils.isBlank(loginStaff.getPhoneNumber())) {
             if (enterprise != null) {
                 staffApiService.wxGetAdd(userId, enterprise.getWxEnterpriseId());
                 loginStaff = staffApiService.selectByUserIdAndEnterpriseId(userId, enterprise.getWxEnterpriseId());