2 Commits 9c0e4bbe8e ... 85119a4c96

Author SHA1 Message Date
  ningsy 85119a4c96 Merge remote-tracking branch 'origin/master' 3 years ago
  ningsy dade185279 nsy 文档中心查询 3 years ago

+ 1 - 1
suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/HelpCenterMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="title != null  and title != ''"> and title = #{title}</if>
             <if test="describe != null  and describe != ''"> and describ = #{describe}</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
-            <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
+            <if test="fileType != null  and fileType != ''"> and file_type like concat('%', #{fileType}, '%')</if>
             <if test="classifyTitle != null  and classifyTitle != ''"> and classify_title = #{classifyTitle}</if>
             <if test="delFlag != null "> and del_flag = #{delFlag}</if>
         </where>

+ 15 - 13
suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/helpCenter/center.html

@@ -11,20 +11,21 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <p>分类标题:</p>
+                                <p>文档类别:</p>
                                 <input type="text" name="classifyTitle"/>
                             </li>
                             <li>
-                                <p>标题:</p>
+                                <p>文件标题:</p>
                                 <input type="text" name="title"/>
                             </li>
                             <li>
-                                <p>描述:</p>
+                                <p>文件描述:</p>
                                 <input type="text" name="describe"/>
                             </li>
                             <li>
                                 <p>文件类型:</p>
-                                <select name="fileType" th:with="type=${@dict.getType('')}">
+                                <select name="fileType" th:with="type=${@dict.getType('help_center_file_type')}">
+                                    <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
@@ -47,9 +48,9 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="helpCenter:center:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="helpCenter:center:export">
+               <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="helpCenter:center:export">
                     <i class="fa fa-download"></i> 导出
-                 </a>
+                 </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -78,13 +79,17 @@
                     title : '主键id',
                     visible: false
                 },
+                {
+                    field : 'classifyTitle',
+                    title : '文档类别'
+                },
                 {
                     field : 'title', 
-                    title : '标题'
+                    title : '文件标题'
                 },
                 {
                     field : 'describe', 
-                    title : '描述'
+                    title : '文件描述'
                 },
                 {
                     field : 'fileUrl', 
@@ -94,13 +99,10 @@
                     field : 'fileType', 
                     title : '文件类型'
                 },
-                {
-                    field : 'classifyTitle', 
-                    title : '分类标题'
-                },
                 {
                     field : 'delFlag', 
-                    title : '是否删除'
+                    title : '是否删除',
+                    visible: false
                 },
                 {
                     title: '操作',