From 1259287e119a21304ea175e83d9ff8fc12a19cf6 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 18 Feb 2025 12:03:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=85=B3=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1359317758869504]资源清单关键字搜索结果不对 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1359317758869504
---
 .../mapper/resourcecenter/ResourceMapper.xml  | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
index c29d5a17..e1fb41c7 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
@@ -389,6 +389,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             resultType="java.lang.Long">
         SELECT m.`id` FROM (
         SELECT DISTINCT a.`id`
+        <if test="keywordList != null and keywordList.size() > 0">
+            ,count(distinct fw.word) as match_count
+        </if>
         <if test="isNameFieldSort != null and isNameFieldSort == 1">
             , a.`name`
         </if>
@@ -451,17 +454,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             </if>-->
             <include refid="resource_ipobject_where"/>
         </where>
-        <choose>
-            <when test="isNameFieldSort != null and isNameFieldSort == 1">
-                ORDER BY LENGTH(a.`name`)
-            </when>
-            <when test="isIpFieldSort != null and isIpFieldSort == 1">
-                ORDER BY LENGTH(a.`ip`)
-            </when>
-            <otherwise>
-                ORDER BY a.`id`
-            </otherwise>
-        </choose>
+        <if test="keywordList != null and keywordList.size() > 0">
+            group by a.id
+        </if>
+        <trim prefix="ORDER BY" suffixOverrides=",">
+            <if test="keywordList != null and keywordList.size() > 0">
+                match_count DESC,
+            </if>
+            <choose>
+                <when test="isNameFieldSort != null and isNameFieldSort == 1">
+                    LENGTH(a.`name`)
+                </when>
+                <when test="isIpFieldSort != null and isIpFieldSort == 1">
+                    LENGTH(a.`ip`)
+                </when>
+                <otherwise>
+                    a.`id`
+                </otherwise>
+            </choose>
+        </trim>
         LIMIT #{startNum}, #{pageSize}
         ) m
     </select>
-- 
Gitee


From f839fd2e2eff4998a65478729291a2b8529edfe5 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 19 Feb 2025 15:55:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=85=B3=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1359317758869504]资源清单关键字搜索结果不对 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1359317758869504
---
 .../mapper/resourcecenter/ResourceMapper.xml   | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
index e1fb41c7..acd8afab 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml
@@ -392,12 +392,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         <if test="keywordList != null and keywordList.size() > 0">
             ,count(distinct fw.word) as match_count
         </if>
-        <if test="isNameFieldSort != null and isNameFieldSort == 1">
-            , a.`name`
-        </if>
-        <if test="isIpFieldSort != null and isIpFieldSort == 1">
-            , a.`ip`
-        </if>
         FROM @{DATA_SCHEMA}.`scence_ipobject_detail` a
         <if test="protocolIdList != null and protocolIdList.size() > 0">
             LEFT JOIN `cmdb_resourcecenter_resource_account` b ON b.`resource_id` = a.`id`
@@ -461,17 +455,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             <if test="keywordList != null and keywordList.size() > 0">
                 match_count DESC,
             </if>
-            <choose>
-                <when test="isNameFieldSort != null and isNameFieldSort == 1">
-                    LENGTH(a.`name`)
-                </when>
-                <when test="isIpFieldSort != null and isIpFieldSort == 1">
-                    LENGTH(a.`ip`)
-                </when>
-                <otherwise>
-                    a.`id`
-                </otherwise>
-            </choose>
+            a.`id` DESC
         </trim>
         LIMIT #{startNum}, #{pageSize}
         ) m
-- 
Gitee