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