长庆项目day3

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();
         }
 
 

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);
 }

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);
 

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>