diff --git a/src/main/java/com/spring/modules/project/controller/ProjectController.java b/src/main/java/com/spring/modules/project/controller/ProjectController.java index b47959de..bea4dae5 100644 --- a/src/main/java/com/spring/modules/project/controller/ProjectController.java +++ b/src/main/java/com/spring/modules/project/controller/ProjectController.java @@ -46,6 +46,16 @@ public class ProjectController { return R.ok().put("page", page); } + /** + * 项目信息查询(不校验超级管理员权限) + */ + @PostMapping(value="/projectInfoSearchForQuery") + @ResponseBody + public R projectInfoSearchForQuery(@RequestBody PlmProjectInfoData data){ + PageUtils page = projectService.projectInfoSearchForQuery(data); + return R.ok().put("page", page); + } + @PostMapping(value = "/projectInfoSearch/any") @ResponseBody public R projectInfoSearchByAnyField(@RequestBody QuerySavedVo data){ diff --git a/src/main/java/com/spring/modules/project/service/ProjectService.java b/src/main/java/com/spring/modules/project/service/ProjectService.java index 168f4873..ac37757c 100644 --- a/src/main/java/com/spring/modules/project/service/ProjectService.java +++ b/src/main/java/com/spring/modules/project/service/ProjectService.java @@ -26,6 +26,14 @@ public interface ProjectService { */ PageUtils projectInfoSearch(PlmProjectInfoData inData); + /** + * @param inData + * @return + * @Description 查询项目(不校验超级管理员权限,用于项目信息查询页面) + * @date 2024/12/04 + */ + PageUtils projectInfoSearchForQuery(PlmProjectInfoData inData); + /** * @Description 查询项目集合 diff --git a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java index c40a6617..553f9a13 100644 --- a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java @@ -115,6 +115,14 @@ public class ProjectServiceImpl implements ProjectService { return new PageUtils(resultList); } + @Override + public PageUtils projectInfoSearchForQuery(PlmProjectInfoData inData){ + // 不校验超级管理员权限,直接查询所有项目 + IPage resultList = this.projectDao.projectInfoSearch( + new Page(inData.getPage(), inData.getLimit()), inData, false); + return new PageUtils(resultList); + } + @Override public List projectInfoListSearch(String site, String projectId, diff --git a/src/main/java/com/spring/modules/sys/controller/SysUserController.java b/src/main/java/com/spring/modules/sys/controller/SysUserController.java index 0073cd60..6660e588 100644 --- a/src/main/java/com/spring/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/spring/modules/sys/controller/SysUserController.java @@ -52,7 +52,7 @@ public class SysUserController extends AbstractController { @ResponseBody public R list( SysUserEntityData params){ //只有超级管理员,才能查看所有管理员列表 - if(getUserId() != Constant.SUPER_ADMIN&&sysMenuDao.checkSuperAdmin(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()).size()==0){ + if(getUserId() != Constant.SUPER_ADMIN && sysMenuDao.checkSuperAdmin(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()).size()==0){ params.setCreateUserId(getUserId()); } PageUtils page = sysUserService.queryPage(params);