From e6a9a810a0cbe66bb02de96588ac6c5057047f41 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 17 六月 2024 16:24:59 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 14 +++++++++++---
ruoyi-service/ruoyi-study/pom.xml | 10 +++++-----
2 files changed, 16 insertions(+), 8 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..970f3f3 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,8 +178,11 @@
user.setNickName(nickName);
user.setDeptId(deptId);
user.setPhonenumber(phonenumber);
- if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
- return error("手机号已存在，请重新输入");
+ SysUser byId = userService.getById(dto.getUserId());
+ if (!byId.getPhonenumber().equals(phonenumber)){
+ if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+ return error("手机号已存在，请重新输入");
+ }
}
user.setUserName(user.getPhonenumber());
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
diff --git a/ruoyi-service/ruoyi-study/pom.xml b/ruoyi-service/ruoyi-study/pom.xml
index e00ab6c..64d4dd4 100644
--- a/ruoyi-service/ruoyi-study/pom.xml
+++ b/ruoyi-service/ruoyi-study/pom.xml
@@ -22,11 +22,11 @@
<scope>system</scope>
<systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
</dependency>
- <dependency>
- <groupId>com.huaweicloud.sdk</groupId>
- <artifactId>huaweicloud-sdk-bundle</artifactId>
- <version>3.1.87</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.huaweicloud.sdk</groupId>-->
+<!-- <artifactId>huaweicloud-sdk-bundle</artifactId>-->
+<!-- <version>3.1.87</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
--
Gitblit v1.7.1