From 247031a6fcf4da2c2d5485142293dd5c3fd3aeb7 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 17 Apr 2024 17:16:53 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=9F=A9=E9=98=B5?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81matrixLab?=
 =?UTF-8?q?el=E6=9B=BF=E4=BB=A3matrixUuid=EF=BC=8CattrName=E6=9B=BF?=
 =?UTF-8?q?=E4=BB=A3attrUuid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1136926608818176]矩阵两个接口支持matrixLabel替代matrixUuid，attrName替代attrUuid http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1136926608818176
---
 .../matrix/dao/mapper/MatrixMapper.xml        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.xml
index 341362317..6187765a8 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixMapper.xml
@@ -71,7 +71,7 @@
 				AND `type` = #{type}
 			</if>
 			<if test="keyword != null and keyword != ''">
-				AND `name` LIKE CONCAT('%', #{keyword}, '%')
+				AND (`name` LIKE CONCAT('%', #{keyword}, '%') OR `uuid` LIKE CONCAT('%', #{keyword}, '%') OR `label` LIKE CONCAT('%', #{keyword}, '%'))
 			</if>
 		</where>
 	</select>
@@ -90,25 +90,25 @@
 
 	<select id="searchMatrix" resultMap="matrixMap">
 			SELECT 
-			a.`id`,
-			a.`uuid`,
-			a.`name`,
-			a.`label`,
-			a.`type`,
-			a.`fcu`,
-			a.`fcd`,
-			a.`lcu`,
-			a.`lcd`
-			FROM `matrix` a
+			`id`,
+			`uuid`,
+			`name`,
+			`label`,
+			`type`,
+			`fcu`,
+			`fcd`,
+			`lcu`,
+			`lcd`
+			FROM `matrix`
 			<where>
 				<if test="type != null and type != ''">
-					AND a.`type` = #{type}
+					AND `type` = #{type}
 				</if>
 				<if test="keyword != null and keyword != ''">
-					AND a.`name` LIKE CONCAT('%', #{keyword}, '%')
+					AND (`name` LIKE CONCAT('%', #{keyword}, '%') OR `uuid` LIKE CONCAT('%', #{keyword}, '%') OR `label` LIKE CONCAT('%', #{keyword}, '%'))
 				</if>
 			</where>
-			ORDER BY a.`id` desc
+			ORDER BY `id` desc
 			LIMIT #{startNum}, #{pageSize}
 	</select>
 
-- 
Gitee