@@ -68,7 +68,7 @@ public class ResourceLibraryController extends BaseController { | |||||
public TableDataInfo list(ResourceLibrary resourceLibrary) { | public TableDataInfo list(ResourceLibrary resourceLibrary) { | ||||
// 是否管理员 | // 是否管理员 | ||||
SysUser user = SecurityUtils.getLoginUser().getUser(); | 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) { | if (!isRole) { | ||||
List<String> appIdList = applyService.lambdaQuery().eq(Apply::getDeptId, SecurityUtils.getDeptId()).list().stream().map(Apply::getAppId).collect(Collectors.toList()); | List<String> appIdList = applyService.lambdaQuery().eq(Apply::getDeptId, SecurityUtils.getDeptId()).list().stream().map(Apply::getAppId).collect(Collectors.toList()); | ||||
@@ -728,13 +728,6 @@ public class ApplyPlanServiceImpl extends ServiceImpl<ApplyPlanMapper, ApplyPlan | |||||
JobStartVO jobStartVO = YinDaoHttpUtils.appStart(applyStartBO); | JobStartVO jobStartVO = YinDaoHttpUtils.appStart(applyStartBO); | ||||
ApplyPlan updateApplyPlan = new ApplyPlan(); | ApplyPlan updateApplyPlan = new ApplyPlan(); | ||||
updateApplyPlan.setId(runApplyPlan.getId()); | updateApplyPlan.setId(runApplyPlan.getId()); | ||||
try{ | |||||
updateApplyPlan.setCreateBy(SecurityUtils.getUsername()); | |||||
updateApplyPlan.setCreateTime(new Date()); | |||||
}catch (Exception e){ | |||||
updateApplyPlan.setCreateBy("系统创建"); | |||||
updateApplyPlan.setCreateTime(new Date()); | |||||
} | |||||
updateApplyPlan.setUpdateBy("系统修改"); | updateApplyPlan.setUpdateBy("系统修改"); | ||||
updateApplyPlan.setUpdateTime(new Date()); | updateApplyPlan.setUpdateTime(new Date()); | ||||
updateApplyPlan.setStartTime(new Date()); | updateApplyPlan.setStartTime(new Date()); | ||||