From e3fbc610e61ab2decb949a456b61047480aa7484 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 23 八月 2023 16:18:03 +0800
Subject: [PATCH] # 企业端用户 新增 修改

---
 server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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..e3ac14e 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java
@@ -570,10 +570,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 +693,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