diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java index d4b71ed..31d9a50 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java @@ -41,7 +41,7 @@ public class FireCheckListController { @ApiOperation("消防点检分页") @PostMapping("/list") -// @PreAuthorize("@pms.hasAnyPermission('xfdjb')") + @PreAuthorize("@pms.hasAnyPermission('xfdjb')") public PageResponse page(@RequestBody FireCheckListPageQry qry) { return fireCheckListService.listPage(qry); } @@ -89,7 +89,7 @@ public class FireCheckListController { } @ApiOperation("PC端-点位检查记录分页") @PostMapping("/checkListRecordList") -// @PreAuthorize("@pms.hasAnyPermission('dwjcjl')") + @PreAuthorize("@pms.hasAnyPermission('dwjcjl')") public PageResponse checkListRecordList(@RequestBody FireCheckListRecordPageQry qry) { return fireCheckListService.checkListRecordList(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java index 0c21753..2ca4b10 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java @@ -60,7 +60,7 @@ public class FireCheckRecordController { @ApiOperation("股份端-分公司消防检查记录") @PostMapping("/corpCheckRecordList") -// @PreAuthorize("@pms.hasAnyPermission('fgsxfjcjl')") + @PreAuthorize("@pms.hasAnyPermission('fgsxfjcjl')") public PageResponse corpCheckRecordList(@RequestBody CorpStatisticsPageQry qry) { return fireCheckRecordService.corpCheckRecordList(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java index f748cf6..47c57e8 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java @@ -45,7 +45,7 @@ public class FireCheckStandardController { @ApiOperation("消防检查标准分页") @PostMapping("/list") -// @PreAuthorize("@pms.hasAnyPermission('xfqcjcbz')") + @PreAuthorize("@pms.hasAnyPermission('xfqcjcbz')") public PageResponse page(@RequestBody FireCheckStandardPageQry qry) { return fireCheckStandardService.listPage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java index 322d63f..344514c 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java @@ -46,7 +46,7 @@ public class FireDeviceController { @ApiOperation("消防器材分页") @PostMapping("/list") -// @PreAuthorize("@pms.hasAnyPermission('xfqcgl')") + @PreAuthorize("@pms.hasAnyPermission('xfqcgl')") public PageResponse page(@RequestBody FireDevicePageQry qry) { return fireDeviceService.listPage(qry); } @@ -95,13 +95,13 @@ public class FireDeviceController { @ApiOperation("股份端-消防器材统计汇总首页分页") @PostMapping("/corpStatisticslist") -// @PreAuthorize("@pms.hasAnyPermission('xfqctjhz')") + @PreAuthorize("@pms.hasAnyPermission('xfqctjhz')") public PageResponse corpStatisticslist(@RequestBody CorpStatisticsPageQry qry) { return fireDeviceService.corpStatisticslist(qry); } @ApiOperation("股份端-消防器材统计汇总首页总数") @GetMapping("/corpStatisticsTotal") -// @PreAuthorize("@pms.hasAnyPermission('xfqctjhz')") + @PreAuthorize("@pms.hasAnyPermission('xfqctjhz')") public SingleResponse corpStatisticsTotal() { return SingleResponse.of(fireCheckListService.riskDistributionStatistic()); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java index 3ace523..f6a612c 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java @@ -41,7 +41,7 @@ public class FirePointController { @ApiOperation("分页") @PostMapping("/list") -// @PreAuthorize("@pms.hasAnyPermission('xfdwwh')") + @PreAuthorize("@pms.hasAnyPermission('xfdwwh')") public PageResponse page(@RequestBody FirePointPageQry qry) { return firePointService.listPage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java index c5e5368..15827d1 100644 --- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java +++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java @@ -40,7 +40,7 @@ public class FireRegionController { @ApiOperation("消防区域列表分页") @PostMapping("/list") -// @PreAuthorize("@pms.hasAnyPermission('xfqywh')") + @PreAuthorize("@pms.hasAnyPermission('xfqywh')") public PageResponse page(@RequestBody FireRegionPageQry qry) { return fireRegionService.listPage(qry); } diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index 180bd1c..602ebc6 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -11,6 +11,15 @@ AND c.corp_name LIKE CONCAT('%',#{params.likeCorpName},'%') + + and c.use_flag = #{params.eqUseFlag} + + + and c.type in + + #{item} + + order by c.corp_order asc, c.create_time desc