From 219908b0bafdbcad82824e4c476b01652aeaaa8d Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 7 Jan 2025 15:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=91=E7=8E=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java    | 3 ++-
 .../manage/service/serviceimpl/EdPrjServiceImpl.java         | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 83f7257..5a341ea 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -921,7 +921,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code);
         for (int i = 0; i < prjIds.size(); i++) {
-            lambdaQuery.or().likeRight(EdFileInfo::getFilePath, prjIds.get(i));
+            String prjId = prjIds.get(i);
+            lambdaQuery.or(qr -> qr.likeRight(EdFileInfo::getFilePath, prjId + MYSQL_FILE_PATH_SPLIT));
         }
         Page<EdFileInfo> edFileInfoPage = this.baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQuery);
         long total = edFileInfoPage.getTotal();
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
index 5be0df9..8225e9f 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
@@ -436,7 +436,10 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
         List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).select(EdFileInfo::getFilePath)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                 .eq(EdFileInfo::getPrjDir, true)
-                .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code).or().eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code));
+                .and(qr -> qr
+                        .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)
+                        .or()
+                        .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code)));
         Set<String> unpublishFiles = new HashSet<>();
         for (EdFileInfo edFileInfo : edFileInfos) {
             String filePath = edFileInfo.getFilePath();