From 3c7e6f5e5890926532501c9c75415a1d885f78aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 十一月 2023 17:33:35 +0800
Subject: [PATCH] bug

---
 server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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 1a2cd97..54ba793 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
@@ -187,7 +187,7 @@
 //                throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "宸ュ彿宸插瓨鍦�");
 //            }
 //        }
-        if ("admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
+        if (user != null && "admin".equals(user.getUsername()) && Objects.equal(systemUser.getStatus(),1)){
             throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瓒呯骇绠$悊鍛樿处鍙蜂笉鍏佽绂佺敤");
         }
         // 淇敼鐢ㄦ埛
@@ -220,6 +220,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