新增用户和新增入职-手机号根据租户校验

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/UserApiFallbackFactory.java

@@ -39,6 +39,11 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
             }
 
             @Override
+            public Integer selectCountByMobileByTenantId(String mobile,String tenantId,String userId) {
+                return null;
+            }
+
+            @Override
             public Map<String, Object> sendRandomCodes(String mobile, String randomCode) throws Exception {
                 return null;
             }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IUserApi.java

@@ -30,6 +30,13 @@ public interface IUserApi {
      */
     @RequestMapping(value = BASE_URL + "/selectCountByMobile", method = RequestMethod.POST)
     Integer selectCountByMobile(@RequestParam(value = "mobile")String mobile);
+
+    /**
+     * 根据联系电话查询用户,区分租户
+     * @return
+     */
+    @RequestMapping(value = BASE_URL + "/selectCountByMobileByTenantId", method = RequestMethod.POST)
+    Integer selectCountByMobileByTenantId(@RequestParam(value = "mobile")String mobile,@RequestParam(value = "tenantId")String tenantId,@RequestParam(value = "userId")String userId);
     /**
      * 发送短信
      * @param mobile

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentRegistrationController.java

@@ -640,6 +640,19 @@ public class EnrollmentRegistrationController {
 
 
     /**
+     * 查询
+     * @param mobilePhone
+     * @return
+     */
+    @ApiOperation(value = "联系电话唯一性，区分租户")
+    @GetMapping("/findMobilePhoneOnlyByTenantId")
+    public ResponseEntity<Integer> findMobilePhoneOnlyByTenantId(@RequestParam String mobilePhone,@RequestParam String tenantId,@RequestParam String userId) throws Exception{
+        Integer count = service.findMobilePhoneOnlyByTenantId(mobilePhone,tenantId,userId);
+        return ResponseEntity.ok(count);
+    }
+
+
+    /**
      * 下载导入用户数据模板
      *
      * @param response

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -713,52 +713,51 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             if (CollectionUtils.isNotEmpty(idCardBack)) {
                 info.setIdCardBack(idCardBack);
             }
-
-            //查询教育经历数据
-            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByUserId(userId, "5");
-            info.setEduInfoList(eduInfoList);
-
-            //查询工作经历数据
-            List<EnrollmentWorkInfo> workInfos = workInfoService.findByUserId(userId, "5");
-            info.setWorkInfoList(workInfos);
-
-            //查询培训经历数据
-            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByUserId(userId, "5");
-            info.setTrainingInfoList(trainingInfos);
-
-            //查询资质证书数据
-            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByUserId(userId, "5");
-            info.setCertificateInfoList(certificateInfoList);
-
-            //查询专业技能数据
-            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByUserId(userId, "5");
-            info.setSkillInfoList(skillInfoList);
-
-            //查询语言能力数据
-            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByUserId(userId, "5");
-            info.setLanguageInfoList(languageInfoList);
-
-            //查询家庭成员数据
-            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByUserId(userId, "5");
-            info.setFamilyInfoList(familyInfoList);
-
-            //查询奖项信息
-            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId, "5");
-            info.setRewardInfoList(rewardInfoList);
-
-            //查询劳动合同
-            List<EnrollmentLaborContractInfo> laborContractInfoList = laborContractInfoService.findByUserId(userId, "5");
-            info.setLaborContractInfoList(laborContractInfoList);
-
-            //查询社会及行业职务
-            List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, "5");
-            info.setSocietyInfoList(societyInfoList);
-
-            //工作业绩
-            List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, "5");
-            info.setPerformanceInfoList(performanceInfoList);
-
-
+            if(StringUtils.isNotBlank(userId)){
+                //查询教育经历数据
+                List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByUserId(userId, "5");
+                info.setEduInfoList(eduInfoList);
+
+                //查询工作经历数据
+                List<EnrollmentWorkInfo> workInfos = workInfoService.findByUserId(userId, "5");
+                info.setWorkInfoList(workInfos);
+
+                //查询培训经历数据
+                List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByUserId(userId, "5");
+                info.setTrainingInfoList(trainingInfos);
+
+                //查询资质证书数据
+                List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByUserId(userId, "5");
+                info.setCertificateInfoList(certificateInfoList);
+
+                //查询专业技能数据
+                List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByUserId(userId, "5");
+                info.setSkillInfoList(skillInfoList);
+
+                //查询语言能力数据
+                List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByUserId(userId, "5");
+                info.setLanguageInfoList(languageInfoList);
+
+                //查询家庭成员数据
+                List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByUserId(userId, "5");
+                info.setFamilyInfoList(familyInfoList);
+
+                //查询奖项信息
+                List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId, "5");
+                info.setRewardInfoList(rewardInfoList);
+
+                //查询劳动合同
+                List<EnrollmentLaborContractInfo> laborContractInfoList = laborContractInfoService.findByUserId(userId, "5");
+                info.setLaborContractInfoList(laborContractInfoList);
+
+                //查询社会及行业职务
+                List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, "5");
+                info.setSocietyInfoList(societyInfoList);
+
+                //工作业绩
+                List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, "5");
+                info.setPerformanceInfoList(performanceInfoList);
+            }
         }
 
         return info;
@@ -1002,6 +1001,12 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         return integer;
     }
 
+    public Integer findMobilePhoneOnlyByTenantId(String mobilePhone,String tenantId,String userId) throws Exception {
+        // 删除基础信息表
+        Integer integer = SpringUtil.getBean(IUserApi.class).selectCountByMobileByTenantId(mobilePhone,tenantId,userId);
+        return integer;
+    }
+
     /**
      * 获取正式工在职状态为离职的，并且user表中未删除的
      *

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/UserApiImpl.java

@@ -47,6 +47,12 @@ public class UserApiImpl implements IUserApi {
     }
 
     @Override
+    public Integer selectCountByMobileByTenantId(String mobile,String tenantId,String userId) {
+        Integer num = userService.selectCountByMobileByTenantId(mobile,tenantId,userId);
+        return num;
+    }
+
+    @Override
     public Map<String, Object> sendRandomCodes(String mobile, String randomCode) throws Exception {
         return ALiYunSmsUtil.updatePasswordSendSms(mobile, randomCode);
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -925,6 +925,19 @@ public class UserService extends ServiceImpl<UserMapper, User> {
         return integer;
     }
 
+    public Integer selectCountByMobileByTenantId(String mobile,String tenantId,String userId) {
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mobile", mobile);
+        queryWrapper.eq("tenant_id", tenantId);
+        queryWrapper.eq("del_flag", 0);
+        if(StringUtils.isNotBlank(userId)){
+            queryWrapper.ne("id", userId);
+        }
+        // 删除基础信息表
+        Integer integer = userMapper.selectCount(queryWrapper);
+        return integer;
+    }
+
     /**
      * 根据id获取用户过滤掉tenantId
      *