From cc5fea21e860117cc19b6b6a2ffb5a9172861cfa Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 2 Aug 2024 09:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=99=BB=E5=BD=95=20?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=B4=A6=E5=8F=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/dao/TbPlussShopStaffMapper.java   | 1 +
 .../system/cashierservice/service/LoginService.java         | 2 +-
 src/main/resources/mapper/TbPlussShopStaffMapper.xml        | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussShopStaffMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussShopStaffMapper.java
index dec7561..8f954bb 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussShopStaffMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbPlussShopStaffMapper.java
@@ -20,4 +20,5 @@ public interface TbPlussShopStaffMapper {
     int updateByPrimaryKey(TbPlussShopStaff record);
 
     TbPlussShopStaff selectByAccount(String account);
+    TbPlussShopStaff selectByAccountAndShopId(String account,String shopId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
index c760ea8..5e04407 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -87,7 +87,7 @@ public class LoginService {
             return Result.fail(CodeEnum.MERCHANTEIXST);
         }
 
-        TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffMapper.selectByAccount(loginReq.getLoginName());
+        TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffMapper.selectByAccountAndShopId(loginReq.getLoginName(),account.getShopId());
         if (ObjectUtil.isEmpty(tbPlussShopStaff)) {
             return Result.fail(CodeEnum.ACCOUNTEIXST);
         } else if (!tbPlussShopStaff.getStatus()) {
diff --git a/src/main/resources/mapper/TbPlussShopStaffMapper.xml b/src/main/resources/mapper/TbPlussShopStaffMapper.xml
index 9bda03b..a6525b6 100644
--- a/src/main/resources/mapper/TbPlussShopStaffMapper.xml
+++ b/src/main/resources/mapper/TbPlussShopStaffMapper.xml
@@ -202,4 +202,10 @@
   <select id="selectByAccount" resultMap="BaseResultMap">
     select * from tb_pluss_shop_staff where account=#{account}
     </select>
+  <select id="selectByAccountAndShopId" resultMap="BaseResultMap">
+    select * from tb_pluss_shop_staff where account=#{account}
+    <if test="shopId != null and shopId!=''">
+      and shop_id=#{shopId}
+    </if>
+  </select>
 </mapper>
\ No newline at end of file