parent
fd6ea9e9b5
commit
8d7d959347
|
|
@ -10,6 +10,7 @@ import com.jjb.saas.framework.utils.DataEncryptDecryptUtil;
|
||||||
import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
|
import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
|
||||||
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
|
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
|
||||||
import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum;
|
import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum;
|
||||||
|
import com.zcloud.basic.info.domain.enums.UserTypeEnum;
|
||||||
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
|
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
|
||||||
import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
|
import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
|
||||||
import com.zcloud.gbscommon.excelEntity.UserExcelImportEntity;
|
import com.zcloud.gbscommon.excelEntity.UserExcelImportEntity;
|
||||||
|
|
@ -371,6 +372,15 @@ public class UserE extends BaseE {
|
||||||
if (CollUtil.isNotEmpty(userList)) {
|
if (CollUtil.isNotEmpty(userList)) {
|
||||||
throw new BizException("当前手机号已在其他企业属于固定人员");
|
throw new BizException("当前手机号已在其他企业属于固定人员");
|
||||||
}
|
}
|
||||||
|
userEList.forEach(userE -> {
|
||||||
|
//如果是企业不是相关方企业,则不行
|
||||||
|
if(!userE.getUserType().equals(UserTypeEnum.XGF.getCode()) && (UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag())
|
||||||
|
|| UserEmploymentFlagEnum.ENTRY_AUDIT.getCode().equals(userE.getEmploymentFlag())
|
||||||
|
|| UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode().equals(userE.getEmploymentFlag()))){
|
||||||
|
throw new BizException("当前手机号已存在");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
//判断是否在当前企业存在
|
//判断是否在当前企业存在
|
||||||
//判断是否有当前企业
|
//判断是否有当前企业
|
||||||
boolean flag = userEList.stream().filter(userE -> UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag())
|
boolean flag = userEList.stream().filter(userE -> UserEmploymentFlagEnum.ON.getCode().equals(userE.getEmploymentFlag())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue