From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化

---
 server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index a3f1165..b191d9c 100644
--- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -20,6 +20,7 @@
 import com.doumee.service.system.SystemPositionUserService;
 import com.doumee.service.system.SystemUserRoleService;
 import com.doumee.service.system.SystemUserService;
+import com.google.common.base.Objects;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -56,6 +57,9 @@
         }
         if (Constants.formatIntegerNum(user.getFixed())==Constants.ONE ) {
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇峰嬁鍒犻櫎" + user.getUsername() + "锛屽洜涓鸿繖鏄浐瀹氱敤鎴�");
+        }
+        if ("admin".equals(user.getUsername())){
+            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瓒呯骇绠＄悊鍛樿处鍙蜂笉鍏佽鍒犻櫎");
         }
         systemUserService.deleteById(id);
     }
@@ -107,14 +111,14 @@
     @Transactional
     public void create(CreateSystemUserDTO systemUser) {
 
-        if (StringUtils.isBlank(systemUser.getMobile()) || systemUser.getMobile().length() < 6){
+        if (StringUtils.isBlank(systemUser.getUsername()) ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍒涘缓鐢ㄦ埛鍙傛暟閿欒");
         }
         // 楠岃瘉鐢ㄦ埛鍚�
         SystemUser queryUserDto = new SystemUser();
         queryUserDto.setUsername(systemUser.getUsername());
         queryUserDto.setDeleted(Constants.ZERO);
-        queryUserDto.setUsername(systemUser.getMobile());
+//        queryUserDto.setUsername(systemUser.getUsername());
         SystemUser user = systemUserService.findOne(queryUserDto);
         if (user != null) {
             throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
@@ -133,10 +137,11 @@
         // 鐢熸垚瀵嗙爜鐩�
         String salt = RandomStringUtils.randomAlphabetic(6);
         // 鐢熸垚瀵嗙爜
-        systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getMobile().substring(systemUser.getMobile().length() - 6), salt));
+//        systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getMobile().substring(systemUser.getMobile().length() - 6), salt));
+        systemUser.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PWD).getCode(), salt));
         systemUser.setSalt(salt);
         systemUser.setId(UUID.randomUUID().toString());
-        systemUser.setUsername(systemUser.getMobile());
+
         // 鍒涘缓鐢ㄦ埛璁板綍
         systemUserService.create(systemUser);
         // 璁剧疆閮ㄩ棬
@@ -164,7 +169,11 @@
     @Override
     public void updateById(CreateSystemUserDTO systemUser) {
         // 楠岃瘉鐢ㄦ埛鍚�
+        if (StringUtils.isBlank(systemUser.getUsername()) ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄦ埛鍚嶄笉鑳戒负绌�");
+        }
         SystemUser queryUserDto = new SystemUser();
+//        queryUserDto.setId(systemUser.getId());
         queryUserDto.setUsername(systemUser.getUsername());
         queryUserDto.setDeleted(Constants.ZERO);
         SystemUser user = systemUserService.findOne(queryUserDto);
@@ -173,14 +182,17 @@
         }
 
         // 楠岃瘉宸ュ彿
-        if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
-            queryUserDto = new SystemUser();
-            queryUserDto.setEmpNo(systemUser.getEmpNo());
-            queryUserDto.setDeleted(Constants.ZERO);
-            user = systemUserService.findOne(queryUserDto);
-            if (user != null && !user.getId().equals(systemUser.getId())) {
-                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
-            }
+//        if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
+//            queryUserDto = new SystemUser();
+//            queryUserDto.setEmpNo(systemUser.getEmpNo());
+//            queryUserDto.setDeleted(Constants.ZERO);
+//            SystemUser user1 = systemUserService.findOne(queryUserDto);
+//            if (user1 != null && !user1.getId().equals(systemUser.getId())) {
+//                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
+//            }
+//        }
+        if (user != null && "admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
+            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瓒呯骇绠＄悊鍛樿处鍙蜂笉鍏佽绂佺敤");
         }
         // 淇敼鐢ㄦ埛
         systemUserService.updateById(systemUser);
@@ -212,6 +224,22 @@
         }
     }
 
+
+    @Override
+    public void updateStatusById(CreateSystemUserDTO systemUser) {
+
+        SystemUser queryUserDto = new SystemUser();
+        queryUserDto.setId(systemUser.getId());
+        queryUserDto.setDeleted(Constants.ZERO);
+        SystemUser user = systemUserService.findOne(queryUserDto);
+
+        if ("admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
+            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瓒呯骇绠＄悊鍛樿处鍙蜂笉鍏佽绂佺敤");
+        }
+        // 淇敼鐢ㄦ埛
+        systemUserService.updateById(systemUser);
+    }
+
     @Override
     @Transactional
     public void createUserRole(CreateUserRoleDTO dto) {

--
Gitblit v1.9.3