From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 e8aae6a..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
@@ -169,12 +169,12 @@
public void updateById(CreateSystemUserDTO systemUser) {
// 楠岃瘉鐢ㄦ埛鍚�
SystemUser queryUserDto = new SystemUser();
- queryUserDto.setId(systemUser.getId());
+// queryUserDto.setId(systemUser.getId());
queryUserDto.setUsername(systemUser.getUsername());
queryUserDto.setDeleted(Constants.ZERO);
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null && !user.getId().equals(systemUser.getId())) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鎵嬫満鍙峰凡瀛樺湪");
}
// 楠岃瘉宸ュ彿
@@ -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