diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index 104cda1..a62ebfe 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -81,9 +81,17 @@ public class DisasterInfoController { public R> list(CallForHelpVo CallForHelpVo, Query query) { CallForHelpVo userRole = disasterInfoService.getByNameRole("admin"); String userRole1 = AuthUtil.getUserRole(); - if (userRole1.equals("TENANT_ADMIN")){ - CallForHelpVo.setChiefIdEquals(null); + + if (CallForHelpVo.getChiefIdEquals()!=null){ + if (userRole1.equals("TENANT_ADMIN") && !CallForHelpVo.getChiefIdEquals().equals(userRole.getRoleId())){ + CallForHelpVo.setChiefIdEquals(null); + } + }else { + if (userRole1.equals("TENANT_ADMIN")){ + CallForHelpVo.setChiefIdEquals(null); + } } + IPage pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo); return R.data(pages); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index cbe0aff..719bb7c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -153,8 +153,6 @@ public class DisasterInfoServiceImpl extends ServiceImpl page(IPage page, CallForHelpVo callForHelpVo) { - - return page.setRecords(this.baseMapper.page(page, callForHelpVo)); }