From b7ade7d14952a908eb4c333a4ef4b9b9494f2b66 Mon Sep 17 00:00:00 2001
From: sxlong <shixiaolong@cqida.cn>
Date: Thu, 28 Nov 2024 14:56:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BD=9C=E5=BA=9F=E7=9A=84?=
 =?UTF-8?q?bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indicator/service/impl/EDDataServiceImpl.java  |  8 ++++++++
 .../main/resources/sqlmapper/EdDataInfoMapper.xml  | 14 +++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java b/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
index 51b417d..b4c00be 100644
--- a/domain/src/main/java/com/electromagnetic/industry/software/data/manage/domain/boardservice/indicator/service/impl/EDDataServiceImpl.java
+++ b/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;
     }
diff --git a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
index 3b7a41d..26f0d5e 100644
--- a/infrastructure/repository/src/main/resources/sqlmapper/EdDataInfoMapper.xml
+++ b/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>