Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -192,6 +192,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         }
         bo.getzEngineeringNodeBo().setCivliId(bo.getId());
         bo.getzEngineeringNodeBo().setType(bo.getType());
+        bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
         zEngineeringNodeBo.setCivliId(bo.getId());
         zEngineeringNodeBo.setType(bo.getType());
@@ -210,7 +211,6 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     @Override
     public Boolean updateNodeByBo(ZEngineeringIndustryBo bo) {
         ZEngineeringIndustry update = BeanUtil.toBean(bo, ZEngineeringIndustry.class);
-        validEntityBeforeSave(update);
         boolean flag = baseMapper.updateById(update) > 0;
         if (flag){
             List<ZEngiineeringPhoto> list = new ArrayList<>();
@@ -227,7 +227,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                     newPhoto.setParentId(bo.getId());
                     newPhoto.setPicUrl(pic.getUrl());
                     newPhoto.setFileName(pic.getName());
-                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
                     newPhoto.setCreateTime(bo.getCreateTime());
                     newPhoto.setUpdateTime(new Date());
                     list.add(newPhoto);