From a8c77e3d9bba026ea9cc622310da8a7612d0309a Mon Sep 17 00:00:00 2001
From: guoxin <371864209@qq.com>
Date: Mon, 25 Sep 2023 09:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E6=8E=A7=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BE=93=E5=85=A5=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/js/directory/directory-basicdata.js   | 1 -
 .../bianmu/service/impl/DirectoryTableServiceImpl.java     | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/shandan-control/src/main/resources/static/js/directory/directory-basicdata.js b/shandan-control/src/main/resources/static/js/directory/directory-basicdata.js
index 281c83c..cf55356 100644
--- a/shandan-control/src/main/resources/static/js/directory/directory-basicdata.js
+++ b/shandan-control/src/main/resources/static/js/directory/directory-basicdata.js
@@ -57,7 +57,6 @@ function startRender() {
                     {field: 'formComment', title: '表单名称'},
                     {field: 'createUserName', title: '操作用户'},
                     {field: 'createTime', title: '关联时间'},
-
                     {
                         fixed: 'right',
                         title: '操作',
diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/impl/DirectoryTableServiceImpl.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/impl/DirectoryTableServiceImpl.java
index 9513840..2b8ed0c 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/impl/DirectoryTableServiceImpl.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/impl/DirectoryTableServiceImpl.java
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.Set;
@@ -54,6 +55,12 @@ public class DirectoryTableServiceImpl extends BaseServiceImpl<DirectoryTableMap
         dirIds.add(table.getDirId());
         wrapper.clear();
         wrapper.in("DIRECTORY_ID", dirIds);
+        if (StringUtils.hasText(table.getFormComment())) {
+            wrapper.and(subWrapper -> subWrapper
+                    .like("FORM_COMMENT", table.getFormComment())
+                    .or()
+                    .like("FORM_NAME", table.getFormComment()));
+        }
         return super.page(page, wrapper);
     }