From 7d24e80fa144606d155f5fe5206239ca6586d255 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Mon, 8 May 2023 13:59:01 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kening/vordm/controller/DisasterInfoController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<IPage<CallForHelpVo>> 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<CallForHelpVo> pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo);