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 = cqEnterMapper.rulesByType(typeId); + + + List 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 { List getPersonType(); - List rulesByType(int typeId); + List 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 ; \ No newline at end of file