From 3eb5581fa9f1b364d0f66395fc049c78700b3edb Mon Sep 17 00:00:00 2001
From: ovo <ovo@ovo.com>
Date: Sat, 19 Oct 2024 19:44:12 +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       | 4 ++--
 .../shapelight/modules/iCq/dal/mysql/enter/CqEnterMapper.java | 2 +-
 .../modules/iCq/dal/mysql/member/CqMemberMapper.java          | 1 +
 .../src/main/resources/mapper/iCq/CqMemberMapper.xml          | 3 +++
 4 files changed, 7 insertions(+), 3 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 2c97f78..a30f075 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,9 +57,9 @@ public class CqEnterController {
     }
 
     @GetMapping("/rulesByType")
-      public R rulesByType(Integer typeId, Long cellId){
+      public R rulesByType(Long typeId, Long cellId){
         if(typeId == null){
-            typeId = cqMemberMapper.speciallyForVisitors();
+            typeId = cqMemberMapper.speciallyForVisitors2();
         }
 
 
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 2c67502..d87264f 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, @Param("cellId") Long cellId);
+    List<TypeRules> rulesByType(long typeId, @Param("cellId") Long cellId);
 
     int changeState(int ruleId);
 }
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/member/CqMemberMapper.java b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/member/CqMemberMapper.java
index d8e04cf..8eb88e0 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/member/CqMemberMapper.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/iCq/dal/mysql/member/CqMemberMapper.java
@@ -16,6 +16,7 @@ public interface CqMemberMapper extends BaseMapper<TenPersonEntity> {
     String takeTheNameAccordingToType(Integer personType);
 
     Integer speciallyForVisitors();
+    Long speciallyForVisitors2();
 
     Long orgidBecomesCellId(String orgId);
 
diff --git a/shapelight-admin/src/main/resources/mapper/iCq/CqMemberMapper.xml b/shapelight-admin/src/main/resources/mapper/iCq/CqMemberMapper.xml
index c65c103..76c9a4d 100644
--- a/shapelight-admin/src/main/resources/mapper/iCq/CqMemberMapper.xml
+++ b/shapelight-admin/src/main/resources/mapper/iCq/CqMemberMapper.xml
@@ -18,6 +18,9 @@
     <select id="speciallyForVisitors" resultType="java.lang.Integer">
         SELECT label_id FROM ten_label WHERE name = '访客人员'
     </select>
+    <select id="speciallyForVisitors2" resultType="java.lang.Long">
+        SELECT type FROM ten_label WHERE name = '访客人员'
+    </select>
     <select id="orgidBecomesCellId" resultType="java.lang.Long">
         SELECT cell_id from ten_cell WHERE org_id = #{orgId}
     </select>