glj-代码提交

This commit is contained in:
glj 2023-05-08 14:07:44 +08:00
parent 7d24e80fa1
commit 688595e8c8
1 changed files with 3 additions and 2 deletions

View File

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