1.修改作废的bug。

domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java

@@ -240,7 +240,15 @@ public class EDDataServiceImpl implements EDDataService {
             FileUtil.rename(Paths.get(fileStorageFullPath) ,fileNameNew,true);
         }
 
+        // 修改文件夹
         edDataRepository.updateFileInfo(parames);
+        // 修改文件夹中的文件
+        if(edDataInfo.getDataType().equals("folder") && parames.getEffectFlag() != null) {
+            EDDataParams paramesChild = new EDDataParams();
+            paramesChild.setParentId(edDataInfo.getDataId());
+            paramesChild.setEffectFlag(parames.getEffectFlag());
+            edDataRepository.updateFileInfo(paramesChild);
+        }
 
         return Boolean.TRUE;
     }

infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml

@@ -103,10 +103,18 @@
       </if>
       gmt_modified = now()
     </set>
-    where data_id = #{dataId,jdbcType=VARCHAR} and effect_flag = 1
+    <where>
+      <!-- 条件 1：按数据编码修改 -->
+      <if test="dataId != null and dataId != ''">
+        data_id = #{dataId,jdbcType=VARCHAR}
+      </if>
+      <!-- 条件 2：按目录编码修改 -->
+      <if test="parentId != null and parentId != ''">
+        category_id = #{parentId,jdbcType=VARCHAR}
+      </if>
+    </where>
+
   </update>
 
-
-
 </mapper>