From 152e2261e842e4bfe32843106847cacf00a5f978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 3 Mar 2025 10:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=AE=E6=94=B9bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/account/dto/staff/ShopStaffEditDTO.java   | 4 ++++
 .../service/account/service/impl/ShopStaffServiceImpl.java | 7 ++++---
 2 files changed, 8 insertions(+), 3 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 65a9a40a..754f9290 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
@@ -2,6 +2,7 @@ package com.czg.account.dto.staff;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -29,14 +30,17 @@ public class ShopStaffEditDTO {
     /**
      * 登录账号
      */
+    @Size(min = 1, message = "登录账号不为空")
     private String accountName;
     /**
      * 登录密码
      */
+    @Size(min = 1, message = "登录密码不为空")
     private String accountPwd;
     /**
      * 手机号
      */
+    @Size(min = 1, message = "手机号不为空")
     private String phone;
     /**
      * 员工编号
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 6b0651b2..ddb84bd2 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
@@ -77,12 +77,13 @@ public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff
             sysUser.setPhone(shopStaffEditDTO.getPhone());
         }
 
-        if (StrUtil.isNotBlank(shopStaffEditDTO.getAccountName()) && !shopStaffEditDTO.getAccountName().equals(sysUser.getAccount())) {
-            long count = sysUserService.count(new QueryWrapper().eq(SysUser::getAccount, shopStaffEditDTO.getAccountName()).ne(SysUser::getId, sysUser.getId()));
+        String accountName = StpKit.USER.getLoginIdAsString() + "@" + shopStaffEditDTO.getAccountName();
+        if (StrUtil.isNotBlank(shopStaffEditDTO.getAccountName()) && !accountName.equals(sysUser.getAccount())) {
+            long count = sysUserService.count(new QueryWrapper().eq(SysUser::getAccount, accountName).ne(SysUser::getId, sysUser.getId()));
             if (count > 0) {
                 throw new ApiNotPrintException("此账户名已存在");
             }
-            sysUser.setAccount(StpKit.USER.getLoginIdAsString() + "@" + shopStaffEditDTO.getAccountName());
+            sysUser.setAccount(accountName);
         }
         sysUserService.updateById(sysUser);