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 subWrapper + .like("FORM_COMMENT", table.getFormComment()) + .or() + .like("FORM_NAME", table.getFormComment())); + } return super.page(page, wrapper); }