From af0332c78a78e6501130ec483ecf4250918073b3 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 06 九月 2023 13:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 6ef500b..83d12c5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -46,6 +46,9 @@
 
     <select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
         select * from PL_CODE_CLASSIFY where is_deleted = 0
+        <if test="tenantId != null and tenantId != ''">
+            and tenant_id = #{tenantId}
+        </if>
     </select>
 
     <select id="selectAllLevelChildOid" resultType="java.util.HashMap">
@@ -103,7 +106,7 @@
                 codeclassify0.tenant_id = #{tenantId}
             </if>
         </where>
-        order by id asc
+        order by lastmodifytime asc
     </select>
 
     <select id="selectAllLevelChildHasPath" resultMap="plCodeClassifyResultMap">
@@ -304,7 +307,7 @@
         <if test="tenantId != null and tenantId != ''">
             and codeclassify0.tenant_id = #{tenantId}
         </if>
-        order by id asc
+        order by lastmodifytime desc
     </select>
 
     <select id="selectClassifyByKeyAndReseRel" resultMap="plCodeClassifyResultMap">
@@ -362,7 +365,7 @@
         </if>
 
         <if test="tenantId != null and tenantId != ''">
-            codeclassify0.tenant_id = #{tenantId}
+            and codeclassify0.tenant_id = #{tenantId}
         </if>
         order by id asc
     </select>

--
Gitblit v1.10.0