|
@@ -553,7 +553,8 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
|
|
public Boolean updateNodeByBo(ZEngineeringIndustryBo bo) {
|
|
public Boolean updateNodeByBo(ZEngineeringIndustryBo bo) {
|
|
ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
|
|
ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
|
|
boolean flag = baseMapper.updateById(update) > 0;
|
|
boolean flag = baseMapper.updateById(update) > 0;
|
|
- bo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
|
|
|
|
|
|
+ ZEngineeringIndustryVo voById = baseMapper.selectVoById(bo.getId());
|
|
|
|
+ bo.setCreateTime(voById.getCreateTime());
|
|
if (flag) {
|
|
if (flag) {
|
|
if (!ObjectUtils.isEmpty(bo.getFiles())) {
|
|
if (!ObjectUtils.isEmpty(bo.getFiles())) {
|
|
List<ZEngiineeringPhoto> list = new ArrayList<>();
|
|
List<ZEngiineeringPhoto> list = new ArrayList<>();
|
|
@@ -616,9 +617,16 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())){
|
|
if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())){
|
|
List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();
|
|
List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();
|
|
if (engineeringInfoBoList1 != null && !engineeringInfoBoList1.isEmpty()) {
|
|
if (engineeringInfoBoList1 != null && !engineeringInfoBoList1.isEmpty()) {
|
|
|
|
+ if ("2".equals(voById.getType())) {
|
|
|
|
+ engineeringInfoBoList1.stream().forEach(iy->{
|
|
|
|
+ iy.setzEngiineeringPhotoBoList(Collections.EMPTY_LIST);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
nodeService.updateMuch(bo.getzEngineeringNodeBo());
|
|
nodeService.updateMuch(bo.getzEngineeringNodeBo());
|
|
}
|
|
}
|
|
}
|
|
}
|