From ce1bce47c5d985f12255b5cf373aa5192e685062 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 31 Aug 2022 09:47:46 +0800
Subject: [PATCH] ...

---
 .../resources/mapper/resource/ResourceDao.xml | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 9eac9df5..d9fcaf98 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -222,7 +222,7 @@
         WHERE 1 = 1
         AND del_flag = 0
         <if test="type != null and type != ''">
-            AND MATCH (type) AGAINST ( #{type}  IN BOOLEAN MODE)
+            AND MATCH (type) AGAINST ( #{type} IN BOOLEAN MODE)
         </if>
         AND type != '赋能案例'
         GROUP BY type
@@ -580,7 +580,7 @@
         1 = 1
         AND tda.attr_type = '应用领域'
         AND tda.del_flag = 0
-        AND ( attr_value != '' AND attr_value IS NOT NULL )
+        AND ( attr_value IS NOT NULL AND attr_value != '')
         GROUP BY
         attr_value
         ORDER BY
@@ -658,7 +658,7 @@
         sys_dept sd
         LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource WHERE 1 = 1 AND del_flag = 0
         <if test="resourceType != null and resourceType != ''">
-            AND MATCH (type) AGAINST ( #{resourceType}  IN BOOLEAN MODE)
+            AND MATCH (type) AGAINST ( #{resourceType} IN BOOLEAN MODE)
         </if>
         GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id
         ) temp1
@@ -699,7 +699,7 @@
         LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource
         WHERE 1 = 1 AND del_flag = 0
         <if test="resourceType != null and resourceType != ''">
-            AND MATCH (type) AGAINST ( #{resourceType}  IN BOOLEAN MODE)
+            AND MATCH (type) AGAINST ( #{resourceType} IN BOOLEAN MODE)
         </if>
         GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id
         LEFT JOIN sys_region sr ON sd.district = sr.id
@@ -1034,7 +1034,7 @@
         FROM tb_data_resource
         WHERE 1 = 1
         AND del_flag = 0
-        AND MATCH (type) AGAINST ( #{type}  IN BOOLEAN MODE)
+        AND MATCH (type) AGAINST ( #{type} IN BOOLEAN MODE)
         AND type != '赋能案例'
         LIMIT 30
     </select>
@@ -1153,7 +1153,7 @@
         FROM
         (SELECT a.* FROM tb_data_attr a INNER JOIN tb_data_resource c ON a.data_resource_id = c.id
         WHERE
-        MATCH (c.type) AGAINST ( #{resourceType}  IN BOOLEAN MODE)
+        MATCH (c.type) AGAINST ( #{resourceType} IN BOOLEAN MODE)
         AND c.dept_id = #{id} AND c.del_flag = 0) tdav
         JOIN mysql.help_topic b ON b.help_topic_id &lt; ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value,
         ';', '' ) ) + 1 )
@@ -1179,7 +1179,7 @@
         ) a
         INNER JOIN tb_data_resource_rel b ON a.id = b.key_id INNER JOIN tb_data_resource c ON b.reference_id = c.id
         WHERE b.del_flag = 0 AND
-        MATCH (c.type) AGAINST ( #{resourceType}  IN BOOLEAN MODE)
+        MATCH (c.type) AGAINST ( #{resourceType} IN BOOLEAN MODE)
         AND c.del_flag = 0
         ) a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id AND b.del_flag = 0
         ) tdav
@@ -1604,7 +1604,7 @@
         del_flag = 0
         AND dept_id = #{deptId}
         AND
-        MATCH (type) AGAINST ( '应用资源'  IN BOOLEAN MODE)
+        MATCH (type) AGAINST ( '应用资源' IN BOOLEAN MODE)
         UNION
         SELECT
         ( CASE tda.attr_value WHEN '智能算法' THEN '组件' WHEN '图层服务' THEN '图层' ELSE '其他' END ) AS "type",
@@ -1617,7 +1617,7 @@
         AND tda.del_flag = 0
         AND tdr.id = tda.data_resource_id
         AND tdr.dept_id = #{deptId}
-        AND MATCH (tdr.type) AGAINST ( '组件服务'  IN BOOLEAN MODE)
+        AND MATCH (tdr.type) AGAINST ( '组件服务' IN BOOLEAN MODE)
         AND tda.attr_type = '组件类型'
         AND tda.attr_value IN ( '智能算法', '图层服务' )
         GROUP BY
@@ -1637,7 +1637,7 @@
         tdr.id = tda.data_resource_id
         AND tdr.del_flag = 0
         AND tda.del_flag = 0
-        AND MATCH (tdr.type) AGAINST ( '应用资源'  IN BOOLEAN MODE)
+        AND MATCH (tdr.type) AGAINST ( '应用资源' IN BOOLEAN MODE)
         AND tda.attr_type = '应用图片'
         AND tdr.dept_id = #{deptId}
         ORDER BY
@@ -1651,8 +1651,8 @@
         SELECT m.* FROM
         (
         SELECT a.name,a.id,a.info_list FROM tb_data_resource a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id
-        WHERE a.dept_id = #{deptid} AND a.del_flag = 0 and MATCH (a.type) AGAINST ( '组件服务'  IN BOOLEAN MODE)
-        AND (b.attr_type = '组件类型' AND b.attr_value = '图层服务' ) AND b.del_flag = 0
+        WHERE a.dept_id = #{deptid} AND a.del_flag = 0 and MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE)
+        AND (b.attr_type = '组件类型' AND MATCH (b.attr_value) AGAINST ( '图层服务' IN BOOLEAN MODE)) AND b.del_flag = 0
         ) m
         INNER JOIN tb_data_attr b ON m.id = b.data_resource_id
         AND b.attr_type = '分类' AND LOCATE(#{type},b.attr_value) AND b.del_flag = 0
@@ -1669,9 +1669,9 @@
         FROM tb_data_resource a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id
         WHERE
         a.dept_id = #{deptid}
-        AND MATCH (a.type) AGAINST ( '组件服务'  IN BOOLEAN MODE)
+        AND MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE)
         AND a.del_flag = 0
-        AND (b.attr_type = '组件类型' AND b.attr_value = '智能算法' )
+        AND (b.attr_type = '组件类型' AND MATCH (b.attr_value) AGAINST ( '智能算法' IN BOOLEAN MODE))
         AND b.del_flag = 0
     </select>
 </mapper>
\ No newline at end of file