pc端 相关方可以新增已离职人员
parent
2950609d27
commit
a43fed3d81
|
|
@ -475,6 +475,8 @@ public class UserAddExe {
|
||||||
UserDO userDOUpdate = null;
|
UserDO userDOUpdate = null;
|
||||||
if (CollUtil.isNotEmpty(userList)) {
|
if (CollUtil.isNotEmpty(userList)) {
|
||||||
// UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userE.getPhone());
|
// UserExpandInfoDO userExpandInfoDO = userExpandInfoRepository.getInfoByPhone(userE.getPhone());
|
||||||
|
|
||||||
|
if (UserFlowFlagEnum.FIXED.getCode().equals(cmd.getFlowFlag())) {
|
||||||
//获取在职企业信息
|
//获取在职企业信息
|
||||||
userList.forEach(u -> {
|
userList.forEach(u -> {
|
||||||
if (UserEmploymentFlagEnum.ON.getCode().equals(u.getEmploymentFlag())
|
if (UserEmploymentFlagEnum.ON.getCode().equals(u.getEmploymentFlag())
|
||||||
|
|
@ -483,9 +485,6 @@ public class UserAddExe {
|
||||||
throw new BizException("该固定用户存在未离职信息,无法添加");
|
throw new BizException("该固定用户存在未离职信息,无法添加");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (UserFlowFlagEnum.FIXED.getCode().equals(cmd.getFlowFlag())) {
|
|
||||||
|
|
||||||
Optional<UserDO> optionalUserDO = userList.stream().filter(u -> AuthContext.getTenantId().equals(u.getCorpinfoId()) || u.getCorpinfoId() == null).findFirst();
|
Optional<UserDO> optionalUserDO = userList.stream().filter(u -> AuthContext.getTenantId().equals(u.getCorpinfoId()) || u.getCorpinfoId() == null).findFirst();
|
||||||
if (optionalUserDO.isPresent()) {
|
if (optionalUserDO.isPresent()) {
|
||||||
addFlag = false;
|
addFlag = false;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue