From ab2050c3493afa22619e5bb9c0bfb7b48990f96c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 15:18:38 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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..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
@@ -111,17 +111,17 @@
@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(), "鎵嬫満鍙风爜宸插瓨鍦�");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
}
// 楠岃瘉宸ュ彿
if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
@@ -137,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);
// 璁剧疆閮ㄩ棬
@@ -168,8 +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.setId(systemUser.getId());
queryUserDto.setUsername(systemUser.getUsername());
queryUserDto.setDeleted(Constants.ZERO);
SystemUser user = systemUserService.findOne(queryUserDto);
@@ -187,7 +191,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 +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