lcr hace 3 meses
padre
commit
7c5e1e9769
Se han modificado 2 ficheros con 1 adiciones y 8 borrados
  1. +1
    -1
      ruoyi-business/src/main/java/com/ruoyi/business/controller/ResourceLibraryController.java
  2. +0
    -7
      ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java

+ 1
- 1
ruoyi-business/src/main/java/com/ruoyi/business/controller/ResourceLibraryController.java Ver fichero

@@ -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<String> appIdList = applyService.lambdaQuery().eq(Apply::getDeptId, SecurityUtils.getDeptId()).list().stream().map(Apply::getAppId).collect(Collectors.toList());


+ 0
- 7
ruoyi-business/src/main/java/com/ruoyi/business/service/impl/ApplyPlanServiceImpl.java Ver fichero

@@ -728,13 +728,6 @@ public class ApplyPlanServiceImpl extends ServiceImpl<ApplyPlanMapper, ApplyPlan
JobStartVO jobStartVO = YinDaoHttpUtils.appStart(applyStartBO);
ApplyPlan updateApplyPlan = new ApplyPlan();
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.setUpdateTime(new Date());
updateApplyPlan.setStartTime(new Date());


Cargando…
Cancelar
Guardar