wang_xy 4 місяців тому
батько
коміт
62c3b5e971

+ 1 - 1
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -642,7 +642,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         bo.getzEngineeringInfoBo().setCreateTime(bo.getCreateTime());
         bo.getzEngineeringInfoBo().setUpdateTime(new Date());
         izEngineeringReviewService.deleteByInfoId(bo);
-        if (bo.getTemporaryOrNot()) {
+        if (bo.getTemporaryOrNot() != null && bo.getTemporaryOrNot()) {
             List<ZEngineeringInfoVo> zEngineeringInfoVoList = izEngineeringInfoService.queryList(bo.getzEngineeringInfoBo());
             if (!ObjectUtils.isEmpty(zEngineeringInfoVoList)) {
                 bo.getzEngineeringInfoBo().setId(zEngineeringInfoVoList.get(0).getId());

+ 2 - 2
ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringCivilMapper.xml

@@ -970,7 +970,7 @@
             and a.engin_cycle = 0
         </if>
         <if test="p.createBy != null and p.createBy != ''">
-            and c.create_by like CONCAT(#{p.createBy},'%')
+            and b.update_by like CONCAT(#{p.createBy},'%')
         </if>
         <foreach collection="tableNames" item="name">
             union
@@ -1033,7 +1033,7 @@
                 and a.engin_cycle = 0
             </if>
             <if test="p.createBy != null and p.createBy != ''">
-                and c.create_by like CONCAT(#{p.createBy},'%')
+                and b.update_by like CONCAT(#{p.createBy},'%')
             </if>
         </foreach>
         ) z