diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java index 4b8daff..4389a30 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/homepage/HomepageSummaryServiceImpl.java @@ -297,7 +297,7 @@ public class HomepageSummaryServiceImpl implements HomepageSummaryService{ if ("1".equals(req.getQueryType())) { // 全域督察员查询自己发起的工单 List userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY); - if (!userIds.contains(getLoginUserId())) { + if (CollectionUtils.isNotEmpty(userIds) && !userIds.contains(getLoginUserId())) { userId = getLoginUserId(); } } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java index df91346..4224f29 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.zteits.urbanops.module.workorder.controller.app.maininfo.vo.AppMainIn import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO; import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper; import jakarta.annotation.Resource; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -117,7 +118,7 @@ public class MainInfoServiceImpl implements MainInfoService { if ("1".equals(pageReqVO.getQueryType())) { //全域督察员查询自己发起的工单 List userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY); - if (!userIds.contains(getLoginUserId())) { + if (CollectionUtils.isNotEmpty(userIds) && !userIds.contains(getLoginUserId())) { pageReqVO.setUserId(getLoginUserId()); pageReqVO.setWorkerCompanyId(null); }