From 1fae1e0fbe05051cb5fb03d805d4212770264176 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Tue, 3 Dec 2024 16:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/SysIotModelFieldMapper.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
index ff613731..205674cc 100644
--- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
@@ -28,13 +28,13 @@
             <if test="info.attributeType != null and info.attributeType != ''">
                 and t.attribute_type = #{info.attributeType}
             </if>
-            <if test="info.orderColumn != null and info.orderType != ''">
-                order by ${info.orderColumn}  ${info.orderType}
-            </if>
-            <if test="info.orderColumn == null or info.orderColumn == '' or info.orderType == null or info.orderType == ''">
-                order by t.porder asc
-            </if>
         </where>
+        <if test="info.orderColumn != null and info.orderType != ''">
+            order by ${info.orderColumn}  ${info.orderType}
+        </if>
+        <if test="info.orderColumn == null or info.orderColumn == '' or info.orderType == null or info.orderType == ''">
+            order by t.porder asc
+        </if>
     </select>
 
     <select id="querySysIotModelFieldByModelId" resultType="java.lang.Long">