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 | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 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 530fea1..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
@@ -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);
}
@@ -106,13 +110,18 @@
@Override
@Transactional
public void create(CreateSystemUserDTO systemUser) {
+
+ if (StringUtils.isBlank(systemUser.getMobile()) || systemUser.getMobile().length() < 6){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍒涘缓鐢ㄦ埛鍙傛暟閿欒");
+ }
// 楠岃瘉鐢ㄦ埛鍚�
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(systemUser.getUsername());
queryUserDto.setDeleted(Constants.ZERO);
+ queryUserDto.setUsername(systemUser.getMobile());
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())) {
@@ -128,9 +137,10 @@
// 鐢熸垚瀵嗙爜鐩�
String salt = RandomStringUtils.randomAlphabetic(6);
// 鐢熸垚瀵嗙爜
- systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
+ systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getMobile().substring(systemUser.getMobile().length() - 6), salt));
systemUser.setSalt(salt);
systemUser.setId(UUID.randomUUID().toString());
+ systemUser.setUsername(systemUser.getMobile());
// 鍒涘缓鐢ㄦ埛璁板綍
systemUserService.create(systemUser);
// 璁剧疆閮ㄩ棬
@@ -141,7 +151,7 @@
systemDepartmentUser.setOperaUser(systemUser.getCreateUser());
systemDepartmentUser.setOperaTime(new Date());
systemDepartmentUserService.create(systemDepartmentUser);
- }
+ }
// 璁剧疆宀椾綅
if (systemUser.getPositionIds() != null && systemUser.getPositionIds().size() > 0) {
for (Integer positionId : systemUser.getPositionIds()) {
@@ -159,22 +169,26 @@
public void updateById(CreateSystemUserDTO systemUser) {
// 楠岃瘉鐢ㄦ埛鍚�
SystemUser queryUserDto = new SystemUser();
+// 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(), "鎵嬫満鍙峰凡瀛樺湪");
}
// 楠岃瘉宸ュ彿
- 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);
@@ -206,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