Commit 59879bf3428d5c358b94212849b2a831fb5bd87b
1 parent
f65d0db3
app首页统计详情页面修改,区分督察员和组长
Showing
3 changed files
with
4 additions
and
3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
| ... | ... | @@ -297,7 +297,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{ |
| 297 | 297 | if ("1".equals(req.getQueryType())) { |
| 298 | 298 | // 全域督察员查询自己发起的工单 |
| 299 | 299 | List<Long> userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY); |
| 300 | - if (userIds.contains(getLoginUserId())) { | |
| 300 | + if (!userIds.contains(getLoginUserId())) { | |
| 301 | 301 | userId = getLoginUserId(); |
| 302 | 302 | } |
| 303 | 303 | } | ... | ... |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/enums/common/CommonConstants.java
| ... | ... | @@ -8,6 +8,7 @@ package com.zteits.urbanops.module.system.enums.common; |
| 8 | 8 | */ |
| 9 | 9 | public interface CommonConstants { |
| 10 | 10 | |
| 11 | - public static final String INSPECTOR_ROLE_KEY = "Inspector_global"; | |
| 11 | + /*全域督察员组长*/ | |
| 12 | + public static final String INSPECTOR_ROLE_KEY = "Inspector_global_leader"; | |
| 12 | 13 | |
| 13 | 14 | } | ... | ... |
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java
| ... | ... | @@ -117,7 +117,7 @@ public class MainInfoServiceImpl implements MainInfoService { |
| 117 | 117 | if ("1".equals(pageReqVO.getQueryType())) { |
| 118 | 118 | //全域督察员查询自己发起的工单 |
| 119 | 119 | List<Long> userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY); |
| 120 | - if (userIds.contains(getLoginUserId())) { | |
| 120 | + if (!userIds.contains(getLoginUserId())) { | |
| 121 | 121 | pageReqVO.setUserId(getLoginUserId()); |
| 122 | 122 | pageReqVO.setWorkerCompanyId(null); |
| 123 | 123 | } | ... | ... |