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