From 69c65dda53f5fa7007130e6a7339666b5b5ef52a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 九月 2023 13:39:06 +0800
Subject: [PATCH] 休bug
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 9b726f4..04ea0cb 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -236,8 +236,7 @@
if(Objects.isNull(createCompanyUserDTO)
||StringUtils.isBlank(createCompanyUserDTO.getUserName())
||StringUtils.isBlank(createCompanyUserDTO.getRealName())
- ||StringUtils.isBlank(createCompanyUserDTO.getPassword())
- ||StringUtils.isBlank(createCompanyUserDTO.getMobile())){
+ ||StringUtils.isBlank(createCompanyUserDTO.getPassword()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -259,7 +258,7 @@
systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
systemUser.setSalt(salt);
Integer userId = systemUserService.create(systemUser);
- if(systemUser.getType().equals(Constants.UserType.COMPANY)){
+ if(systemUser.getType().equals(Constants.UserType.COMPANY.getKey())){
SystemUserRole newUserRole = new SystemUserRole();
newUserRole.setUserId(userId);
newUserRole.setRoleId(createCompanyUserDTO.getRoleId());
@@ -271,25 +270,18 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void companyUpdUser(CreateCompanyUserDTO updCreateCompanyUserDTO) {
if(Objects.isNull(updCreateCompanyUserDTO)
- ||Objects.isNull(updCreateCompanyUserDTO.getUserId())
- ||StringUtils.isBlank(updCreateCompanyUserDTO.getRealName())
- ||StringUtils.isBlank(updCreateCompanyUserDTO.getMobile())){
+ ||Objects.isNull(updCreateCompanyUserDTO.getId())
+ ||StringUtils.isBlank(updCreateCompanyUserDTO.getRealName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- SystemUser systemUser = systemUserService.findById(updCreateCompanyUserDTO.getUserId());
+ SystemUser systemUser = systemUserService.findById(updCreateCompanyUserDTO.getId());
if(Objects.isNull(systemUser)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
systemUser.setRealname(updCreateCompanyUserDTO.getRealName());
- systemUser.setMobile(systemUser.getMobile());
-
- // 鐢熸垚瀵嗙爜鐩�
-// String salt = RandomStringUtils.randomAlphabetic(6);
-// // 鐢熸垚瀵嗙爜
-// systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
-// systemUser.setSalt(salt);
+ systemUser.setMobile(updCreateCompanyUserDTO.getMobile());
systemUserService.updateById(systemUser);
- if(systemUser.getType().equals(Constants.UserType.COMPANY)){
+ if(systemUser.getType().equals(Constants.UserType.COMPANY.getKey())){
// 鍒犻櫎鍏宠仈瑙掕壊
SystemUserRole deleteDto = new SystemUserRole();
deleteDto.setUserId(systemUser.getId());
@@ -304,13 +296,25 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void updUserStatus(Integer id,Integer status) {
+
+ SystemUser systemUser = systemUserService.findById(id);
+ if(Objects.isNull(systemUser)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ systemUser.setStatus(status);
+ systemUserService.updateById(systemUser);
+ }
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updPassword(CreateCompanyUserDTO updCreateCompanyUserDTO) {
if(Objects.isNull(updCreateCompanyUserDTO)
- ||Objects.isNull(updCreateCompanyUserDTO.getUserId())
+ ||Objects.isNull(updCreateCompanyUserDTO.getId())
||StringUtils.isBlank(updCreateCompanyUserDTO.getPassword())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- SystemUser systemUser = systemUserService.findById(updCreateCompanyUserDTO.getUserId());
+ SystemUser systemUser = systemUserService.findById(updCreateCompanyUserDTO.getId());
if(Objects.isNull(systemUser)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
--
Gitblit v1.9.3