From b3bfb9bc4bef1f23cb95abb5a947652c311822dd Mon Sep 17 00:00:00 2001
From: ovo <ovo@ovo.com>
Date: Sat, 19 Oct 2024 18:58:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E5=BA=86=E9=A1=B9=E7=9B=AEday3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/iCq/controller/enter/CqEnterController.java   | 6 ++++--
 .../modules/iCq/dal/mysql/enter/CqEnterMapper.java        | 2 +-
 .../src/main/resources/mapper/iCq/CqEnterMapper.xml       | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java
index 777c049..2c97f78 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/controller/enter/CqEnterController.java
@@ -57,11 +57,13 @@ public class CqEnterController {
     }
 
     @GetMapping("/rulesByType")
-      public R rulesByType(Integer typeId){
+      public R rulesByType(Integer typeId, Long cellId){
         if(typeId == null){
             typeId = cqMemberMapper.speciallyForVisitors();
         }
-            List<TypeRules> typeRules = cqEnterMapper.rulesByType(typeId);
+
+
+            List<TypeRules> typeRules = cqEnterMapper.rulesByType(typeId, cellId);
             return R.ok().put("data", typeRules);
         }
 
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java
index 79cd1c9..2c67502 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java
@@ -18,7 +18,7 @@ public interface CqEnterMapper extends BaseMapper<TenEnterConfigEntity> {
 
     List<PeronType> getPersonType();
 
-    List<TypeRules> rulesByType(int typeId);
+    List<TypeRules> rulesByType(int typeId, @Param("cellId") Long cellId);
 
     int changeState(int ruleId);
 }
diff --git a/shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml b/shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml
index 7e9a527..b544044 100644
--- a/shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml
+++ b/shapelight-admin/src/main/resources/mapper/iCq/CqEnterMapper.xml
@@ -23,7 +23,7 @@
             cell_id ;
     </select>
     <select id="getPersonType" resultType="net.shapelight.modules.iCq.controller.enter.vo.PeronType">
-        select label_id, name FROM ten_label WHERE delete_flag = 0
+        select type, name FROM ten_label WHERE delete_flag = 0
     </select>
     <select id="rulesByType" resultType="net.shapelight.modules.iCq.controller.enter.vo.TypeRules">
         SELECT
@@ -36,6 +36,10 @@
             ON
                 tec.id = tect.enter_config_id
         WHERE
-            tect.type_id = #{typeId};
+            tect.type_id = #{typeId}
+        <if  test="cellId != null and cellId != ''">
+            and cell_id = #{cell_id};
+        </if>
+
     </select>
 </mapper>
\ No newline at end of file