From 0af7c58b60c5ee773b0865fa7284bec75ec06e71 Mon Sep 17 00:00:00 2001
From: guoxin <371864209@qq.com>
Date: Fri, 29 Sep 2023 01:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=BC=E5=90=88=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E6=95=B0=E6=8D=AE=E8=B5=84=E6=BA=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E5=85=B3=E9=94=AE=E5=AD=97=E4=B8=8D=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bianmu/mapper/DirectoryResourceMapper.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/mapper/DirectoryResourceMapper.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/mapper/DirectoryResourceMapper.java
index accc20f..56fa462 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/mapper/DirectoryResourceMapper.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/mapper/DirectoryResourceMapper.java
@@ -20,15 +20,15 @@ public interface DirectoryResourceMapper extends BaseMapper<DirectoryResource> {
             "   SELECT DISTINCT TT.* FROM (" +
             "      SELECT * FROM V_DIRECTORY_RESOURCE VDR WHERE DIRECTORY_PATH LIKE (#{dirPath} || '%') AND EXISTS(SELECT 1 FROM B_DIRECTORY D1 WHERE D1.ID = VDR.PARENT_ID AND D1.REVIEW_STATUS IN ('PASS','SUBMITTED'))" +
             "   ) TT " +
+            "   LEFT JOIN (SELECT B2.*, B1.ENTITY_ID FROM B_DATA_LABEL_ENTITY B1 INNER JOIN B_DATA_LABELS B2 ON B1.LABEL_ID = B2.ID) DLN ON DLN.ENTITY_ID = TT.ID " +
+            "   WHERE 1=1 " +
             "   <when test='labels != null and labels.size > 0'>" +
-            "      LEFT JOIN B_DATA_LABEL_ENTITY DLN ON DLN.ENTITY_ID = TT.ID " +
-            "      WHERE 1=1 " +
             "       <foreach item=\"label\" collection=\"labels\">" +
-            "           AND (DLN.ID_PATH LIKE (#{label.idPath + label.id + '/'} || '%') OR DLN.ID = #{label.id})" +
+            "           AND (DLN.ID_PATH LIKE (#{label.idPath} || '%') OR DLN.ID = #{label.id})" +
             "       </foreach>" +
             "   </when>" +
             "   <when test=\"ew.sqlSegment != null and ew.sqlSegment != '' and ew.sqlSegment != '()'\">" +
-            "       ${ew.sqlSegment}" +
+            "       AND ${ew.sqlSegment}" +
             "   </when>" +
             "</script>")
     @ResultType(DirectoryResource.class)
@@ -38,15 +38,15 @@ public interface DirectoryResourceMapper extends BaseMapper<DirectoryResource> {
             "   SELECT DISTINCT TT.* FROM (" +
             "      SELECT * FROM V_DIRECTORY_RESOURCE VDR WHERE DIRECTORY_PATH LIKE (#{dirPath} || '%') AND EXISTS(SELECT 1 FROM B_DIRECTORY D1 WHERE D1.ID = VDR.PARENT_ID AND D1.REVIEW_STATUS IN ('PASS','SUBMITTED'))" +
             "   ) TT " +
+            "   LEFT JOIN (SELECT B2.*, B1.ENTITY_ID FROM B_DATA_LABEL_ENTITY B1 INNER JOIN B_DATA_LABELS B2 ON B1.LABEL_ID = B2.ID) DLN ON DLN.ENTITY_ID = TT.ID " +
+            "   WHERE 1=1 " +
             "   <when test='labels != null and labels.size > 0'>" +
-            "      LEFT JOIN (SELECT B2.*, B1.ENTITY_ID FROM B_DATA_LABEL_ENTITY B1 INNER JOIN B_DATA_LABELS B2 ON B1.LABEL_ID = B2.ID) DLN ON DLN.ENTITY_ID = TT.ID " +
-            "      WHERE 1=1 " +
             "       <foreach item=\"label\" collection=\"labels\">" +
             "           AND (DLN.ID_PATH LIKE (#{label.idPath} || '%') OR DLN.ID = #{label.id})" +
             "       </foreach>" +
             "   </when>" +
             "   <when test=\"ew.sqlSegment != null and ew.sqlSegment != '' and ew.sqlSegment != '()'\">" +
-            "       ${ew.sqlSegment}" +
+            "       AND ${ew.sqlSegment}" +
             "   </when>" +
             "</script>")
     @ResultType(DirectoryResource.class)