From aee7e1fa0fec879b8053b0c5d40ab820dc3f2ef2 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 26 Jul 2024 14:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbPlussShopStaffServiceImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java
index 0fb4aecb..7fa1082a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java
@@ -136,7 +136,11 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(TbPlussShopStaff resources) {
+        if (StringUtils.isBlank(resources.getPassword())) {
+            resources.setPassword(null);
+        }
         TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(resources.getId()).orElseGet(TbPlussShopStaff::new);
+        User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount());
         resources.setUpdatedAt(Instant.now().toEpochMilli());
         ValidationUtil.isNull( tbPlussShopStaff.getId(),"TbPlussShopStaff","id",resources.getId());
         tbPlussShopStaff.copy(resources);
@@ -145,11 +149,11 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
         }
         tbPlussShopStaffRepository.save(tbPlussShopStaff);
         //修改 sysUser账号
-        User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount());
         Set<Role> roles = new HashSet<>();
         Role role = new Role();
         role.setId(resources.getRoleId());
         roles.add(role);
+        sysUser.setUsername(resources.getAccount());
         sysUser.setRoles(roles);
         sysUser.setNickName(resources.getName());
         if (StringUtils.isNotBlank(resources.getPassword())) {