BJ_FS / urbanops

Commit ef25690fc15f8adf0c702d970309567d1339eb20

Authored by 王彪总
2 parents 14b32640 f545c2ff

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java
  View file @ef25690
... ... @@ -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 (CollectionUtils.isNotEmpty(userIds) && !userIds.contains(getLoginUserId())) {
301 301 userId = getLoginUserId();
302 302 }
303 303 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java
  View file @ef25690
... ... @@ -11,6 +11,7 @@ import com.zteits.urbanops.module.workorder.controller.app.maininfo.vo.AppMainIn
11 11 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
12 12 import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper;
13 13 import jakarta.annotation.Resource;
  14 +import org.apache.commons.collections4.CollectionUtils;
14 15 import org.springframework.stereotype.Service;
15 16 import org.springframework.validation.annotation.Validated;
16 17  
... ... @@ -117,7 +118,7 @@ public class MainInfoServiceImpl implements MainInfoService {
117 118 if ("1".equals(pageReqVO.getQueryType())) {
118 119 //全域督察员查询自己发起的工单
119 120 List<Long> userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY);
120   - if (!userIds.contains(getLoginUserId())) {
  121 + if (CollectionUtils.isNotEmpty(userIds) && !userIds.contains(getLoginUserId())) {
121 122 pageReqVO.setUserId(getLoginUserId());
122 123 pageReqVO.setWorkerCompanyId(null);
123 124 }
... ...