|
@@ -1264,7 +1264,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
|
List<ApsProcessOperationProcessEquDo> beforeUpdatingConflictId = this.baseMapper.getTimeOverlapByEquId(oldEquId,
|
|
|
apsProcessOperationProcessEquDo.getId(), oldPlanstartdate, oldPlanenddate, currentProcessWay);
|
|
|
List<ApsProcessOperationProcessEquDo> aboutProcessEquList = new ArrayList<>();
|
|
|
- if (!returnAboutIds.isEmpty()){
|
|
|
+ if (returnAboutIds!= null&&!returnAboutIds.isEmpty()){
|
|
|
aboutProcessEquList = (List<ApsProcessOperationProcessEquDo>) apsProcessOperationProcessEquService.listByIds(returnAboutIds);
|
|
|
}
|
|
|
if (!beforeUpdatingConflictId.isEmpty()) {
|