|
@@ -57,17 +57,17 @@ public class SopServiceImpl extends ServiceImpl<SopMapper, SopDO> implements Sop
|
|
|
sopGroupDO.setGroupName("默认分组");
|
|
sopGroupDO.setGroupName("默认分组");
|
|
|
sopGroupService.save(sopGroupDO);
|
|
sopGroupService.save(sopGroupDO);
|
|
|
// 新增人员信息
|
|
// 新增人员信息
|
|
|
- if (!vo.getSopUserList().isEmpty()) {
|
|
|
|
|
|
|
+ if (vo.getSopUserList() != null && !vo.getSopUserList().isEmpty()) {
|
|
|
vo.getSopUserList().forEach(o -> o.setSopId(sop.getId()));
|
|
vo.getSopUserList().forEach(o -> o.setSopId(sop.getId()));
|
|
|
sopUserService.createSopUser(vo.getSopUserList());
|
|
sopUserService.createSopUser(vo.getSopUserList());
|
|
|
}
|
|
}
|
|
|
// 新增隔离点信息
|
|
// 新增隔离点信息
|
|
|
- if (!vo.getSopPointsList().isEmpty()) {
|
|
|
|
|
|
|
+ if (vo.getSopPointsList() != null && !vo.getSopPointsList().isEmpty()) {
|
|
|
vo.getSopPointsList().forEach(o -> o.setSopId(sop.getId()));
|
|
vo.getSopPointsList().forEach(o -> o.setSopId(sop.getId()));
|
|
|
sopPointsService.createSopPoints(vo.getSopPointsList());
|
|
sopPointsService.createSopPoints(vo.getSopPointsList());
|
|
|
}
|
|
}
|
|
|
// 新增流程步骤信息
|
|
// 新增流程步骤信息
|
|
|
- if (!vo.getSopStepList().isEmpty()) {
|
|
|
|
|
|
|
+ if (vo.getSopStepList() != null && !vo.getSopStepList().isEmpty()) {
|
|
|
vo.getSopStepList().forEach(o -> o.setSopId(sop.getId()));
|
|
vo.getSopStepList().forEach(o -> o.setSopId(sop.getId()));
|
|
|
sopWorkflowStepService.createSopWorkflowStep(vo.getSopStepList());
|
|
sopWorkflowStepService.createSopWorkflowStep(vo.getSopStepList());
|
|
|
}
|
|
}
|