From befab2b99fc66710e7bd5e4e245e00229d3d7310 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 26 Nov 2024 10:43:19 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=8E=BB=E9=87=8D=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1297667194322944]视图矩阵去重逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1297667194322944
---
 .../dao/mapper/MatrixViewDataMapper.xml       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
index 6a94852f9..c49b34caf 100644
--- a/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
+++ b/src/main/java/neatlogic/framework/matrix/dao/mapper/MatrixViewDataMapper.xml
@@ -126,78 +126,79 @@
 
     <sql id="searchDynamicTableDataSqlNew">
         <if test="filterList != null and filterList.size() > 0">
+            AND
             <foreach collection="filterList" item="filter" separator="AND">
                 <choose>
                     <when test="filter.expression == 'equal'">
                         <choose>
                             <when test="filter.valueList.size() > 1">
-                                and  `${filter.uuid}` IN
+                                `${filter.uuid}` IN
                                 <foreach collection="filter.valueList" item="item" open="(" close=")" separator=",">
                                     #{item}
                                 </foreach>
                             </when>
                             <otherwise>
-                                and  `${filter.uuid}` = #{filter.valueList[0]}
+                                `${filter.uuid}` = #{filter.valueList[0]}
                             </otherwise>
                         </choose>
                     </when>
                     <when test="filter.expression == 'notequal'">
                         <choose>
                             <when test="filter.valueList.size() > 1">
-                                and (`${filter.uuid}` NOT IN
+                                (`${filter.uuid}` NOT IN
                                 <foreach collection="filter.valueList" item="item" open="(" close=")" separator=",">
                                     #{item}
                                 </foreach>
                                 OR `${filter.uuid}` IS NULL)
                             </when>
                             <otherwise>
-                                and `${filter.uuid}` != #{filter.valueList[0]}
+                                `${filter.uuid}` != #{filter.valueList[0]}
                             </otherwise>
                         </choose>
                     </when>
                     <when test="filter.expression == 'like'">
                         <choose>
                             <when test="filter.valueList.size() > 1">
-                                and `${filter.uuid}` IN
+                                `${filter.uuid}` IN
                                 <foreach collection="filter.valueList" item="item" open="(" close=")" separator=",">
                                     #{item}
                                 </foreach>
                             </when>
                             <otherwise>
-                                and `${filter.uuid}` LIKE CONCAT('%', #{filter.valueList[0]}, '%')
+                                `${filter.uuid}` LIKE CONCAT('%', #{filter.valueList[0]}, '%')
                             </otherwise>
                         </choose>
                     </when>
                     <when test="filter.expression == 'notlike'">
                         <choose>
                             <when test="filter.valueList.size() > 1">
-                                and (`${filter.uuid}` NOT IN
+                                (`${filter.uuid}` NOT IN
                                 <foreach collection="filter.valueList" item="item" open="(" close=")" separator=",">
                                     #{item}
                                 </foreach>
                                 OR `${filter.uuid}` IS NULL)
                             </when>
                             <otherwise>
-                                and (`${filter.uuid}` NOT LIKE CONCAT('%', #{filter.valueList[0]}, '%') OR `${filter.uuid}` IS NULL)
+                                (`${filter.uuid}` NOT LIKE CONCAT('%', #{filter.valueList[0]}, '%') OR `${filter.uuid}` IS NULL)
                             </otherwise>
                         </choose>
                     </when>
                     <when test="filter.expression == 'is-null'">
-                        and (`${filter.uuid}` IS NULL OR `${filter.uuid}` = '')
+                        (`${filter.uuid}` IS NULL OR `${filter.uuid}` = '')
                     </when>
                     <when test="filter.expression == 'is-not-null'">
-                        and (`${filter.uuid}` IS NOT NULL AND `${filter.uuid}` != '')
+                        (`${filter.uuid}` IS NOT NULL AND `${filter.uuid}` != '')
                     </when>
                     <otherwise>
                         <choose>
                             <when test="filter.valueList.size() > 1">
-                                and `${filter.uuid}` IN
+                                `${filter.uuid}` IN
                                 <foreach collection="filter.valueList" item="item" open="(" close=")" separator=",">
                                     #{item}
                                 </foreach>
                             </when>
                             <otherwise>
-                                and `${filter.uuid}` = #{filter.valueList[0]}
+                                `${filter.uuid}` = #{filter.valueList[0]}
                             </otherwise>
                         </choose>
                     </otherwise>
-- 
Gitee