From 941caf616bded8ff1faa0a0875f2f37a11d9913d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 15:52:56 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 970f3f3..c22b791 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -178,17 +178,19 @@
user.setNickName(nickName);
user.setDeptId(deptId);
user.setPhonenumber(phonenumber);
- SysUser byId = userService.getById(dto.getUserId());
- if (!byId.getPhonenumber().equals(phonenumber)){
- if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
- return error("手机号已存在,请重新输入");
- }
+ user.setUserId(dto.getUserId());
+ List<SysUser> list = userService.list(new QueryWrapper<SysUser>()
+ .eq("del_flag", 0)
+ .ne("user_id",dto.getUserId())
+ .eq("phonenumber", dto.getPhonenumber()));
+ if (!list.isEmpty()){
+ return error("手机号已存在,请重新输入");
}
user.setUserName(user.getPhonenumber());
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
user.setNickName(user.getPhonenumber());
}
- user.setPassword(SecurityUtils.encryptPassword("a123456"));
+// user.setPassword(SecurityUtils.encryptPassword("a123456"));
user.setRoleType(1);
user.setUpdateBy(SecurityUtils.getUsername());
user.setUpdateTime(new Date());
--
Gitblit v1.7.1