diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index d2dfca5ae..e62ccabed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -4,12 +4,15 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.service.IOtaManageApplyEOService; import com.jero.modules.project.entity.ProjectTaskPlanning; import com.jero.modules.project.enums.PlanStatusEnum; import com.jero.modules.project.enums.ProjectTaskPlanningNameEnum; import com.jero.modules.project.mapper.ProjectTaskPlanningMapper; import com.jero.modules.project.service.IProjectTaskPlanningService; import com.jero.modules.project.vo.TimeNodeVO; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -31,6 +34,8 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl vdrList = otaManageApplyEOService.getVdrListByProject(projectTaskPlanning.getProjectId(),""); + if(CollectionUtils.isNotEmpty(vdrList)){ + matchVdr = true; + } } deleteById(projectTaskPlanning.getId()); add(projectTaskPlanning); @@ -78,7 +86,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl