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 bd76a13..ad7aec5 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 @@ -80,7 +80,7 @@ public class DisasterInfoController { public R> list(CallForHelpVo CallForHelpVo, Query query) { CallForHelpVo userRole = disasterInfoService.getByNameRole("admin"); Long chiefIdEquals = CallForHelpVo.getChiefIdEquals(); - if (chiefIdEquals.equals(userRole.getRoleId())){ + if (chiefIdEquals == null || chiefIdEquals.equals(userRole.getRoleId())){ CallForHelpVo.setChiefIdEquals(null); } IPage pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo);