From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index a4c03f9..3f2e3a8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -28,6 +28,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
@@ -474,7 +475,7 @@
// checkUserDataScope(userId);
}
// 删除用户与角色关联
-// userRoleMapper.deleteUserRole(userIds);
+ userRoleMapper.deleteUserRole(userIds);
// // 删除用户与岗位关联
// userPostMapper.deleteUserPost(userIds);
return userMapper.deleteUserByIds(userIds);
@@ -585,7 +586,7 @@
.select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
.like(StringUtils.isNotBlank(query.getNickName()
), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "04")
- .eq(SysUser::getDelFlag, "0")
+ .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
@@ -600,31 +601,40 @@
*/
@Override
public void saveSupplier(SupplierDTO dto) {
-
- SysUser user = BeanUtils.copyBean(dto, SysUser.class);
- boolean b = checkPhoneUnique(user);
- if (!b) {
- throw new ServiceException("该手机号已存在");
- }
// 添加
if (StringUtils.isNull(dto.getUserId())) {
+ SysUser user = BeanUtils.copyBean(dto, SysUser.class);
+ boolean b = checkPhoneUnique(user);
+ if (!b) {
+ throw new ServiceException("该手机号已存在");
+ }
user.setUserName(dto.getPhonenumber());
user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
user.setUserType("04");
+ user.setCreateTime(new Date());
+ user.setCreateBy(SecurityUtils.getUsername());
this.save(user);
} else {
// 编辑
- user = this.getById(dto.getUserId());
- if (StringUtils.isNull(user)) {
+ SysUser userUpd = this.getById(dto.getUserId());
+ if (StringUtils.isNull(userUpd)) {
throw new ServiceException("供应商不存在");
}
- user.setNickName(dto.getNickName());
- user.setPhonenumber(dto.getPhonenumber());
- user.setUserName(dto.getPhonenumber());
+ userUpd.setNickName(dto.getNickName());
+ userUpd.setUpdateTime(new Date());
+ userUpd.setUpdateBy(SecurityUtils.getUsername());
if (StringUtils.isNotBlank(dto.getPassword())) {
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
}
- this.updateById(user);
+ if (!userUpd.getPhonenumber().equals(dto.getPhonenumber())) {
+ userUpd.setPhonenumber(dto.getPhonenumber());
+ userUpd.setUserName(dto.getPhonenumber());
+ boolean b = checkPhoneUnique(userUpd);
+ if (!b) {
+ throw new ServiceException("该手机号已存在");
+ }
+ }
+ this.updateById(userUpd);
}
}
--
Gitblit v1.7.1