From 59aefee6fe3a70cba13295fbf890c7ae08340793 Mon Sep 17 00:00:00 2001
From: Jason <jasonwell@139.com>
Date: Wed, 23 Apr 2025 20:15:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=A6=82id=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=8F=AF=E8=83=BD=E4=B8=BA=E5=A4=9A=E6=9D=A1?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=BC=95=E5=8F=91TooManyResultsException?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/src/main/resources/mappers/AppExtensionMapper.xml     | 4 +---
 base/src/main/resources/mappers/AppMapper.xml              | 4 +---
 base/src/main/resources/mappers/BlockGroupMapper.xml       | 4 +---
 base/src/main/resources/mappers/BlockHistoryMapper.xml     | 4 +---
 base/src/main/resources/mappers/BlockMapper.xml            | 4 +---
 base/src/main/resources/mappers/ComponentLibraryMapper.xml | 4 +---
 base/src/main/resources/mappers/ComponentMapper.xml        | 4 +---
 base/src/main/resources/mappers/DatasourceMapper.xml       | 4 +---
 base/src/main/resources/mappers/I18nEntryMapper.xml        | 4 +---
 base/src/main/resources/mappers/MaterialMapper.xml         | 4 +---
 base/src/main/resources/mappers/PageMapper.xml             | 4 +---
 base/src/main/resources/mappers/PageTemplateMapper.xml     | 5 +----
 base/src/main/resources/mappers/PlatformMapper.xml         | 4 +---
 13 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/base/src/main/resources/mappers/AppExtensionMapper.xml b/base/src/main/resources/mappers/AppExtensionMapper.xml
index adaf3010..25c567d0 100644
--- a/base/src/main/resources/mappers/AppExtensionMapper.xml
+++ b/base/src/main/resources/mappers/AppExtensionMapper.xml
@@ -147,9 +147,7 @@
             <include refid="AppExtensionSetColumns"/>
         </set>
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
             <if test="tenantId != null">
                 AND tenant_id = #{tenantId}
             </if>
diff --git a/base/src/main/resources/mappers/AppMapper.xml b/base/src/main/resources/mappers/AppMapper.xml
index 3aa12b4c..31ed64b2 100644
--- a/base/src/main/resources/mappers/AppMapper.xml
+++ b/base/src/main/resources/mappers/AppMapper.xml
@@ -328,9 +328,7 @@
         <include refid="Base_Column_List"/>
         FROM t_app
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/BlockGroupMapper.xml b/base/src/main/resources/mappers/BlockGroupMapper.xml
index 2823700f..2e1d84fc 100644
--- a/base/src/main/resources/mappers/BlockGroupMapper.xml
+++ b/base/src/main/resources/mappers/BlockGroupMapper.xml
@@ -324,9 +324,7 @@
             </otherwise>
         </choose>
         <where>
-            <if test="id != null">
-                AND bg.id = #{id}
-            </if>
+            bg.id = #{id}
             <if test="groupCreatedBy != null">
                 AND bg.created_by = #{groupCreatedBy}
             </if>
diff --git a/base/src/main/resources/mappers/BlockHistoryMapper.xml b/base/src/main/resources/mappers/BlockHistoryMapper.xml
index 1d31c777..62066a5e 100644
--- a/base/src/main/resources/mappers/BlockHistoryMapper.xml
+++ b/base/src/main/resources/mappers/BlockHistoryMapper.xml
@@ -249,9 +249,7 @@
         <include refid="Base_Column_List"/>
         FROM t_block_history
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/BlockMapper.xml b/base/src/main/resources/mappers/BlockMapper.xml
index fb83e5c6..04dc4b85 100644
--- a/base/src/main/resources/mappers/BlockMapper.xml
+++ b/base/src/main/resources/mappers/BlockMapper.xml
@@ -243,9 +243,7 @@
         <include refid="Base_Column_List"/>
         FROM t_block
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/ComponentLibraryMapper.xml b/base/src/main/resources/mappers/ComponentLibraryMapper.xml
index 5cec078e..65f344a2 100644
--- a/base/src/main/resources/mappers/ComponentLibraryMapper.xml
+++ b/base/src/main/resources/mappers/ComponentLibraryMapper.xml
@@ -337,9 +337,7 @@
         FROM t_component_library CL
         LEFT JOIN t_component C ON CL.id = C.library_id
         <where>
-            <if test="id != null">
-                AND CL.id = #{id}
-            </if>
+            CL.id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/ComponentMapper.xml b/base/src/main/resources/mappers/ComponentMapper.xml
index 3fc382c1..3d616e2c 100644
--- a/base/src/main/resources/mappers/ComponentMapper.xml
+++ b/base/src/main/resources/mappers/ComponentMapper.xml
@@ -257,9 +257,7 @@
         <include refid="Base_Column_List"/>
         FROM t_component
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/DatasourceMapper.xml b/base/src/main/resources/mappers/DatasourceMapper.xml
index 9c6f4c97..dc0da8ba 100644
--- a/base/src/main/resources/mappers/DatasourceMapper.xml
+++ b/base/src/main/resources/mappers/DatasourceMapper.xml
@@ -129,9 +129,7 @@
         <include refid="Base_Column_List"/>
         FROM t_datasource
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/I18nEntryMapper.xml b/base/src/main/resources/mappers/I18nEntryMapper.xml
index 26966a37..c8aab7f4 100644
--- a/base/src/main/resources/mappers/I18nEntryMapper.xml
+++ b/base/src/main/resources/mappers/I18nEntryMapper.xml
@@ -154,9 +154,7 @@
         FROM t_i18n_entry E
         LEFT JOIN t_i18n_lang L ON E.lang_id = L.id
         <where>
-            <if test="id != null">
-                AND E.id = #{id}
-            </if>
+            E.id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/MaterialMapper.xml b/base/src/main/resources/mappers/MaterialMapper.xml
index 5a0a35b1..013c0821 100644
--- a/base/src/main/resources/mappers/MaterialMapper.xml
+++ b/base/src/main/resources/mappers/MaterialMapper.xml
@@ -229,9 +229,7 @@
         <include refid="Base_Column_List"/>
         FROM t_material
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/PageMapper.xml b/base/src/main/resources/mappers/PageMapper.xml
index 8786ddbf..11e4ce9d 100644
--- a/base/src/main/resources/mappers/PageMapper.xml
+++ b/base/src/main/resources/mappers/PageMapper.xml
@@ -242,9 +242,7 @@
         FROM t_page P
         LEFT JOIN t_user U ON P.occupier_by = U.id
         <where>
-            <if test="id != null">
-                AND P.id = #{id}
-            </if>
+            P.id = #{id}
         </where>
     </select>
     <!-- 根据appId查询表t_page数据 -->
diff --git a/base/src/main/resources/mappers/PageTemplateMapper.xml b/base/src/main/resources/mappers/PageTemplateMapper.xml
index 949fd328..8ae3853f 100644
--- a/base/src/main/resources/mappers/PageTemplateMapper.xml
+++ b/base/src/main/resources/mappers/PageTemplateMapper.xml
@@ -171,10 +171,7 @@
         <include refid="Base_Column_List"/>
         FROM t_page_template
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
-
+            id = #{id}
         </where>
     </select>
 
diff --git a/base/src/main/resources/mappers/PlatformMapper.xml b/base/src/main/resources/mappers/PlatformMapper.xml
index 052dd768..a55aa9ba 100644
--- a/base/src/main/resources/mappers/PlatformMapper.xml
+++ b/base/src/main/resources/mappers/PlatformMapper.xml
@@ -222,9 +222,7 @@
         <include refid="Base_Column_List"/>
         FROM t_platform
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>