From b8fcfa9d0b17b4d0a559f153f882acfb8ae7a598 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 9 Jun 2023 17:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=81=A2=E5=A4=8D=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E8=B4=A7=E4=BD=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml | 2 +-
 src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
index 3d2086b9..32369a79 100644
--- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
@@ -390,7 +390,7 @@
     </select>
 
     <select id="getMaxSpaceCode" resultType="java.lang.String">
-        select max(CONVERT(code, signed))
+        select max(CONVERT(code, signed)) from auth_space
         <where>
             <if test="invCode != null and invCode != ''">
                 and invWarehouseCode = #{invCode}
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index c42012c9..4cf820cb 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -133,7 +133,14 @@
                 </if>
             </if>
         </where>
-        order by createTime desc
+        <choose>
+            <when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
+                order by ${orderBy}   ${sort}
+            </when>
+            <otherwise>
+                order by updateTime desc
+            </otherwise>
+        </choose>
     </select>
 
     <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderResponse">