From 06997ad92d77b7dd8a002df16b5b0cadc528d5f5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 24 八月 2023 15:28:52 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java b/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
index e14e811..65c732d 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
@@ -213,10 +213,13 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝绗��"+index+"銆戣銆愭墜鏈哄彿銆戝憳宸ヨ处鍙峰凡缁忓瓨锛�");
}
cuu.setPhone(null);
- cuu.setCode(p.getNo());
- if(companyUserService.findOne(cuu) !=null){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝绗��"+index+"銆戣銆愬伐鍙枫�戝凡缁忓瓨锛�");
+ if (StringUtils.isNotBlank(p.getNo())){
+ cuu.setCode(p.getNo());
+ if(companyUserService.findOne(cuu) !=null){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝绗��"+index+"銆戣銆愬伐鍙枫�戝凡缁忓瓨锛�");
+ }
}
+
SystemUser systemUser = new SystemUser();
systemUser.setUsername(cu.getPhone());
systemUser.setDeleted(Boolean.FALSE);
@@ -570,10 +573,14 @@
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙峰凡瀛樺湪锛�");
}
}
- cu.setCode(systemUser.getEmpNo());
- if(companyUserService.findOne(cu) !=null){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
+ //瀛樺湪宸ュ彿闇�瑕佸敮涓�鍒ゆ柇
+ if (StringUtils.isNotBlank(systemUser.getEmpNo())){
+ cu.setCode(systemUser.getEmpNo());
+ if(companyUserService.findOne(cu) !=null){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
+ }
}
+
cu.setUserId(userId);
cu.setComDepartId(loginUser.getComDepartment().getId());
cu.setCreateUser(loginUser.getId());
@@ -689,6 +696,8 @@
if (codeUser != null && !codeUser.getId().equals(cu.getId())) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
}
+ }else if (StringUtils.isBlank(systemUser.getEmpNo())) {
+ u.setCode(systemUser.getEmpNo());
}
u.setId(cu.getId());
u.setName(systemUser.getRealname());
--
Gitblit v1.9.3