From 9c2c35c5cfda85da225e3836d6da2c490f1f7528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 27 Feb 2025 11:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=B4=A6=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/account/dto/staff/ShopStaffEditDTO.java   | 3 ---
 .../service/account/service/impl/ShopStaffServiceImpl.java | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java
index 6feb756b8..65a9a40a2 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/staff/ShopStaffEditDTO.java
@@ -29,7 +29,6 @@ public class ShopStaffEditDTO {
     /**
      * 登录账号
      */
-    @NotEmpty(message = "账号不为空")
     private String accountName;
     /**
      * 登录密码
@@ -38,12 +37,10 @@ public class ShopStaffEditDTO {
     /**
      * 手机号
      */
-    @NotEmpty(message = "手机号不为空")
     private String phone;
     /**
      * 员工编号
      */
-    @NotEmpty(message = "编号不为空")
     private String code;
     /**
      * 优惠类型 1 折扣 0 金额
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
index 36e932b35..99efb8975 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
@@ -65,16 +65,16 @@ public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff
             sysUsersRolesService.updateRole(shopStaff.getId(), shopStaffEditDTO.getRoleId());
         }
 
-        if (!"*******".equals(shopStaffEditDTO.getAccountPwd())) {
+        if (StrUtil.isNotBlank(shopStaffEditDTO.getAccountPwd()) && !"*******".equals(shopStaffEditDTO.getAccountPwd())) {
             sysUserService.updateSysUserPwd(shopStaff.getId(), shopStaffEditDTO.getAccountPwd());
         }
 
         SysUser sysUser = sysUserService.getById(sysUserId);
-        if (!shopStaffEditDTO.getPhone().equals(sysUser.getPhone())) {
+        if (StrUtil.isNotBlank(shopStaffEditDTO.getPhone()) && !shopStaffEditDTO.getPhone().equals(sysUser.getPhone())) {
             sysUser.setPhone(shopStaffEditDTO.getPhone());
         }
 
-        if (!shopStaffEditDTO.getAccountName().equals(sysUser.getAccount())) {
+        if (StrUtil.isNotBlank(shopStaffEditDTO.getAccountName()) && !shopStaffEditDTO.getAccountName().equals(sysUser.getAccount())) {
             long count = sysUserService.count(new QueryWrapper().eq(SysUser::getAccount, shopStaffEditDTO.getAccountName()));
             if (count > 0) {
                 throw new ApiNotPrintException("此账户名已存在");
@@ -84,6 +84,7 @@ public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff
         sysUserService.updateById(sysUser);
 
 
+        shopStaffEditDTO.setCode(StrUtil.isBlank(shopStaffEditDTO.getCode()) ? null : shopStaffEditDTO.getCode());
         BeanUtil.copyProperties(shopStaffEditDTO, shopStaff);
         updateById(shopStaff);