From efe9744eb6651298be9f48b84a5f17c58d7b64eb Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 14:10:26 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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 22c9d1d..67f2902 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
@@ -475,7 +475,7 @@
 //            checkUserDataScope(userId);
         }
         // 删除用户与角色关联
-//        userRoleMapper.deleteUserRole(userIds);
+        userRoleMapper.deleteUserRole(userIds);
 //        // 删除用户与岗位关联
 //        userPostMapper.deleteUserPost(userIds);
         return userMapper.deleteUserByIds(userIds);
@@ -603,12 +603,13 @@
     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())) {
+            boolean b = checkPhoneUnique(user);
+            if (!b) {
+                throw new ServiceException("该手机号已存在");
+            }
             user.setUserName(dto.getPhonenumber());
             user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
             user.setUserType("04");
@@ -618,6 +619,12 @@
         } else {
             // 编辑
             user = this.getById(dto.getUserId());
+            if (!user.getPhonenumber().equals(dto.getPhonenumber())) {
+                boolean b = checkPhoneUnique(user);
+                if (!b) {
+                    throw new ServiceException("该手机号已存在");
+                }
+            }
             if (StringUtils.isNull(user)) {
                 throw new ServiceException("供应商不存在");
             }

--
Gitblit v1.7.1