glj-代码提交
This commit is contained in:
parent
7d24e80fa1
commit
688595e8c8
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue