From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 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 3f506ee..3f2e3a8 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
@@ -601,14 +601,13 @@
      */
     @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);
+            boolean b = checkPhoneUnique(user);
+            if (!b) {
+                throw new ServiceException("该手机号已存在");
+            }
             user.setUserName(dto.getPhonenumber());
             user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
             user.setUserType("04");
@@ -617,19 +616,25 @@
             this.save(user);
         } else {
             // 编辑
-            user = this.getById(dto.getUserId());
-            if (StringUtils.isNull(user)) {
+            SysUser userUpd = this.getById(dto.getUserId());
+            if (StringUtils.isNull(userUpd)) {
                 throw new ServiceException("供应商不存在");
             }
-            user.setNickName(dto.getNickName());
-            user.setPhonenumber(dto.getPhonenumber());
-            user.setUserName(dto.getPhonenumber());
-            user.setUpdateTime(new Date());
-            user.setUpdateBy(SecurityUtils.getUsername());
+            userUpd.setNickName(dto.getNickName());
+            userUpd.setUpdateTime(new Date());
+            userUpd.setUpdateBy(SecurityUtils.getUsername());
             if (StringUtils.isNotBlank(dto.getPassword())) {
-                user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+                userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
             }
-            this.updateById(user);
+            if (!userUpd.getPhonenumber().equals(dto.getPhonenumber())) {
+                userUpd.setPhonenumber(dto.getPhonenumber());
+                userUpd.setUserName(dto.getPhonenumber());
+                boolean b = checkPhoneUnique(userUpd);
+                if (!b) {
+                    throw new ServiceException("该手机号已存在");
+                }
+            }
+            this.updateById(userUpd);
         }
     }
 

--
Gitblit v1.7.1