From 688595e8c88cf03308bc4f120a0235aa518da41e Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Mon, 8 May 2023 14:07:44 +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  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 ad7aec5..104cda1 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
@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.web.bind.annotation.*;
@@ -79,8 +80,8 @@ public class DisasterInfoController {
 	@GetMapping("/list")
 	public R<IPage<CallForHelpVo>> list(CallForHelpVo CallForHelpVo, Query query) {
 		CallForHelpVo userRole = disasterInfoService.getByNameRole("admin");
-		Long chiefIdEquals = CallForHelpVo.getChiefIdEquals();
-		if (chiefIdEquals == null || chiefIdEquals.equals(userRole.getRoleId())){
+		String userRole1 = AuthUtil.getUserRole();
+		if (userRole1.equals("TENANT_ADMIN")){
 			CallForHelpVo.setChiefIdEquals(null);
 		}
 		IPage<CallForHelpVo> pages = disasterInfoService.page(Condition.getPage(query), CallForHelpVo);