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 { List getPersonType(); - List rulesByType(int typeId, @Param("cellId") Long cellId); + List 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 { 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 @@ +