From 4712c04afe2aedeed20ddc5b1a3b0ba66b89cb9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 七月 2024 17:43:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 f9c1af7..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
@@ -1,6 +1,7 @@
package com.ruoyi.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
@@ -127,9 +128,13 @@
public AjaxResult addCompanyUser(@Validated @RequestBody AddCompanyUserDto dto) {
SysUser user = new SysUser();
user.setDeptId(dto.getDeptId());
- if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+ List<SysUser> list = userService.list(new QueryWrapper<SysUser>()
+ .eq("del_flag", 0)
+ .eq("phonenumber", dto.getPhonenumber()));
+ if (!list.isEmpty()){
return error("手机号已存在，请重新输入");
}
+
user.setPhonenumber(dto.getPhonenumber());
user.setNickName(dto.getNickName());
user.setCreateBy(SecurityUtils.getUsername());
@@ -173,14 +178,19 @@
user.setNickName(nickName);
user.setDeptId(deptId);
user.setPhonenumber(phonenumber);
- if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+ 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