Merge branch 'dev' of http://94.191.59.107:3000/wukai/lzga-doc into dev

lzga-modules/lzga-doc/src/main/resources/mapper/doc/DocInfoMapper.xml

@@ -100,6 +100,9 @@
             <if test="updateTime != null ">and UPDATE_TIME = #{updateTime}</if>
             <if test="remark != null  and remark != ''">and REMARK = #{remark}</if>
             <if test="isDel != null  and isDel != ''">and IS_DEL = #{isDel}</if>
+            <if test="params.tagId!=null and params.tagId!=''">and doc_id in(select doc_id from DOC_TAG_RELA where
+                tag_id=#{params.tagId})
+            </if>
         </where>
     </select>
 

lzga-ui/src/views/doc/info/index.vue

@@ -311,10 +311,10 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        const para = {
-          tagId: 123
-        }
-        this.queryParams.params = para;
+        // const para = {
+        //   tagId: 123
+        // }
+        // this.queryParams.params = para;
         this.queryParams.pageNum = 1;
         this.getList();
       },