From 53155df41c5cce8f7be814a25148efe9a7ea25c5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 七月 2024 09:06:20 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 7aa59f0..3f506ee 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);
@@ -553,8 +554,9 @@
}
@Override
- public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String phonenumber) {
- return this.baseMapper.getList(pageInfo,phonenumber);
+ public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, String nickName,
+ String phonenumber, Integer status) {
+ return this.baseMapper.getList(pageInfo, nickName, phonenumber, status);
}
@Override
@@ -583,8 +585,8 @@
Page<SysUser> page = this.lambdaQuery()
.select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
.like(StringUtils.isNotBlank(query.getNickName()
- ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "03")
- .eq(SysUser::getDelFlag, "0")
+ ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "04")
+ .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
@@ -599,23 +601,34 @@
*/
@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);
user.setUserName(dto.getPhonenumber());
user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
- user.setUserType("03");
+ user.setUserType("04");
+ user.setCreateTime(new Date());
+ user.setCreateBy(SecurityUtils.getUsername());
this.save(user);
} else {
// 编辑
- SysUser user = this.getById(dto.getUserId());
+ user = this.getById(dto.getUserId());
if (StringUtils.isNull(user)) {
throw new ServiceException("供应商不存在");
}
user.setNickName(dto.getNickName());
user.setPhonenumber(dto.getPhonenumber());
user.setUserName(dto.getPhonenumber());
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setUpdateTime(new Date());
+ user.setUpdateBy(SecurityUtils.getUsername());
+ if (StringUtils.isNotBlank(dto.getPassword())) {
+ user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ }
this.updateById(user);
}
}
--
Gitblit v1.7.1