From 9e89baa1eee9fb2eae14a69caba7d3a114a5ba36 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Thu, 26 Dec 2024 17:43:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=A1=A3=E6=A1=88=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4sort?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frame/plugin/lets/entity/BdDefdocEntity.xml  | 10 ----------
 .../plugin/lets/entity/BdDefdoclistEntity.xml    | 16 ++++++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.xml
index 8d87fabe..34810698 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.xml
@@ -50,8 +50,6 @@
             <if test="shortname != null and shortname != ''"> and shortname = #{shortname} </if>
             <if test="ts != null and ts != ''"> and ts = #{ts} </if>
     </trim>
-<!--    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
 </select>
     
 <!-- 查询符合条件的数量 -->
@@ -71,8 +69,6 @@
             <if test="shortname != null and shortname != ''"> and shortname = #{shortname} </if>
             <if test="ts != null and ts != ''"> and ts = #{ts} </if>
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
@@ -94,8 +90,6 @@
             <if test="shortname != null and shortname != ''"> and shortname like concat('%',#{shortname},'%') </if>
             <if test="ts != null and ts != ''"> and ts like concat('%',#{ts},'%') </if>
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
 </select>
 
 <!-- 查询列表 字段采用or格式 -->
@@ -117,8 +111,6 @@
              <if test="shortname != null and shortname != ''"> or shortname = #{shortname} </if>
              <if test="ts != null and ts != ''"> or ts = #{ts} </if>
     </trim>
-    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
 </select>
 
 <!--新增所有列-->
@@ -137,7 +129,6 @@
             <if test="sealflag != null and sealflag != ''"> sealflag , </if>
             <if test="shortname != null and shortname != ''"> shortname , </if>
             <if test="ts != null and ts != ''"> ts , </if>
-            <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -154,7 +145,6 @@
             <if test="sealflag != null and sealflag != ''"> #{sealflag} ,</if>
             <if test="shortname != null and shortname != ''"> #{shortname} ,</if>
             <if test="ts != null and ts != ''"> #{ts} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from bd_defdoc a WHERE a.sts = 'Y' ),</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )  
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdoclistEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdoclistEntity.xml
index 3edfc237..077f8ff2 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdoclistEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdoclistEntity.xml
@@ -38,8 +38,8 @@
             <if test="pkDefdoclist != null and pkDefdoclist != ''"> and pk_defdoclist = #{pkDefdoclist} </if>
             <if test="ts != null and ts != ''"> and ts = #{ts} </if>
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    
+    
 </select>
     
 <!-- 查询符合条件的数量 -->
@@ -55,8 +55,7 @@
             <if test="pkDefdoclist != null and pkDefdoclist != ''"> and pk_defdoclist = #{pkDefdoclist} </if>
             <if test="ts != null and ts != ''"> and ts = #{ts} </if>
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
+    
     </select>
 
     <!-- 分页查询列表 采用like格式 -->
@@ -74,8 +73,8 @@
             <if test="pkDefdoclist != null and pkDefdoclist != ''"> and pk_defdoclist like concat('%',#{pkDefdoclist},'%') </if>
             <if test="ts != null and ts != ''"> and ts like concat('%',#{ts},'%') </if>
     </trim>
-    <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+    
+    
 </select>
 
 <!-- 查询列表 字段采用or格式 -->
@@ -93,8 +92,7 @@
              <if test="pkDefdoclist != null and pkDefdoclist != ''"> or pk_defdoclist = #{pkDefdoclist} </if>
              <if test="ts != null and ts != ''"> or ts = #{ts} </if>
     </trim>
-    <if test=" sort == null or sort == ''.toString()  "> order by sorts asc</if>
-    <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
+
 </select>
 
 <!--新增所有列-->
@@ -109,7 +107,6 @@
             <if test="iscorpcanchg != null and iscorpcanchg != ''"> iscorpcanchg , </if>
             <if test="pkDefdoclist != null and pkDefdoclist != ''"> pk_defdoclist , </if>
             <if test="ts != null and ts != ''"> ts , </if>
-            <if test="sorts == null ">sorts,</if>
     <if test="sts == null ">sts,</if>
   </trim>
   )values(
@@ -122,7 +119,6 @@
             <if test="iscorpcanchg != null and iscorpcanchg != ''"> #{iscorpcanchg} ,</if>
             <if test="pkDefdoclist != null and pkDefdoclist != ''"> #{pkDefdoclist} ,</if>
             <if test="ts != null and ts != ''"> #{ts} ,</if>
-            <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from bd_defdoclist a WHERE a.sts = 'Y' ),</if>
     <if test="sts == null ">'Y',</if>
   </trim>
   )