From ed4f07531b9cb0794e976a14cee3b591dec8d4f6 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:22:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 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 67f2902..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,11 +601,9 @@
*/
@Override
public void saveSupplier(SupplierDTO dto) {
-
- SysUser user = BeanUtils.copyBean(dto, SysUser.class);
-
// 添加
if (StringUtils.isNull(dto.getUserId())) {
+ SysUser user = BeanUtils.copyBean(dto, SysUser.class);
boolean b = checkPhoneUnique(user);
if (!b) {
throw new ServiceException("该手机号已存在");
@@ -618,25 +616,25 @@
this.save(user);
} else {
// 编辑
- user = this.getById(dto.getUserId());
- if (!user.getPhonenumber().equals(dto.getPhonenumber())) {
- boolean b = checkPhoneUnique(user);
+ SysUser userUpd = this.getById(dto.getUserId());
+ if (StringUtils.isNull(userUpd)) {
+ throw new ServiceException("供应商不存在");
+ }
+ userUpd.setNickName(dto.getNickName());
+ userUpd.setUpdateTime(new Date());
+ userUpd.setUpdateBy(SecurityUtils.getUsername());
+ if (StringUtils.isNotBlank(dto.getPassword())) {
+ userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ }
+ if (!userUpd.getPhonenumber().equals(dto.getPhonenumber())) {
+ userUpd.setPhonenumber(dto.getPhonenumber());
+ userUpd.setUserName(dto.getPhonenumber());
+ boolean b = checkPhoneUnique(userUpd);
if (!b) {
throw new ServiceException("该手机号已存在");
}
}
- if (StringUtils.isNull(user)) {
- throw new ServiceException("供应商不存在");
- }
- user.setNickName(dto.getNickName());
- user.setPhonenumber(dto.getPhonenumber());
- user.setUserName(dto.getPhonenumber());
- user.setUpdateTime(new Date());
- user.setUpdateBy(SecurityUtils.getUsername());
- if (StringUtils.isNotBlank(dto.getPassword())) {
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
- }
- this.updateById(user);
+ this.updateById(userUpd);
}
}
--
Gitblit v1.7.1