diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JHeadQuartersRevenueController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JHeadQuartersRevenueController.java index b499098..2386d6f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JHeadQuartersRevenueController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JHeadQuartersRevenueController.java @@ -39,7 +39,7 @@ public class JHeadQuartersRevenueController { * @param js 请求参数 * @return 数据 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "分页查询总部企业", response = JHeadQuartersRevenue.class) @GetMapping public AjaxResult page(Page page, JHeadQuartersRevenueRequest js) { @@ -49,7 +49,7 @@ public class JHeadQuartersRevenueController { /** * 查询总部企业数量 */ - @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')") @ApiOperation(value = "查询总部企业数量", response = JHqCountResponse.class) @GetMapping("/selectZbCount") public AjaxResult selectZbCount() { diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml index 66c8e12..fa3689e 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml @@ -38,7 +38,8 @@ where status = 5 GROUP BY project_middle_type) AS ys ON b.dict_value = ys.project_middle_type LEFT JOIN (SELECT project_small_type, - IF(project_small_type = 14, COUNT(DISTINCT credit_code), COUNT(*)) AS count + IF(project_small_type = 14 or project_small_type = 1 or project_small_type = 2 + or project_small_type = 3 , COUNT(DISTINCT credit_code), COUNT(*)) AS count FROM j_project where status = 5 GROUP BY project_small_type) AS us ON c.dict_value = us.project_small_type @@ -53,13 +54,22 @@ ORDER BY CAST(c.dict_value AS UNSIGNED);