diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/ResourceLibraryController.java b/ruoyi-business/src/main/java/com/ruoyi/business/controller/ResourceLibraryController.java index fb01d71..dee88bf 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/controller/ResourceLibraryController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/controller/ResourceLibraryController.java @@ -68,7 +68,7 @@ public class ResourceLibraryController extends BaseController { public TableDataInfo list(ResourceLibrary resourceLibrary) { // 是否管理员 SysUser user = SecurityUtils.getLoginUser().getUser(); - boolean isRole = user.getRoles().stream().filter(e -> e.getRoleId() == 1).count() > 0; + boolean isRole = user.getRoles().stream().anyMatch(e -> e.getRoleId() == 1); if (!isRole) { List appIdList = applyService.lambdaQuery().eq(Apply::getDeptId, SecurityUtils.getDeptId()).list().stream().map(Apply::getAppId).collect(Collectors.toList()); diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java index 7e6d5f6..b7d8145 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java @@ -728,13 +728,6 @@ public class ApplyPlanServiceImpl extends ServiceImpl