Merge branch 'dev'

2024-08-01 18:24:27 +08:00
parent 0a0a863472 16c6ff1ccf
commit 8a07cde563
6 changed files with 23 additions and 13 deletions
--- 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
@@ -100,7 +100,7 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
        if (!PhoneUtil.validator(resources.getPhone())){
            throw new BadRequestException("手机号格式有误");
        }
-        if (userRepository.findByUsername(resources.getAccount()) != null) {
+        if (userRepository.findByUsername(resources.getShopId()+"@"+resources.getAccount()) != null) {
            throw new BadRequestException("员工账号已存在");
        }