From 08264c4daaf32fc1d58543f575d0f4e28f196a46 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 九月 2023 15:01:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml |    7 ++-----
 1 files changed, 2 insertions(+), 5 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 83d12c5..8f12082 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
@@ -45,9 +45,9 @@
     </sql>
 
     <select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
-        select * from PL_CODE_CLASSIFY where is_deleted = 0
+        select * from PL_CODE_CLASSIFY where
         <if test="tenantId != null and tenantId != ''">
-            and tenant_id = #{tenantId}
+            tenant_id = #{tenantId}
         </if>
     </select>
 
@@ -241,7 +241,6 @@
                         SYS_CONNECT_BY_PATH(id, '#')   as paths
                     </otherwise>
                 </choose>
-
         from pl_code_classify  plcodeclassify
                   START WITH parentCodeClassifyOid is null
               CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
@@ -363,7 +362,6 @@
         <if test="parentOid == null or parentOid == ''">
             and codeclassify0.parentcodeclassifyoid is null
         </if>
-
         <if test="tenantId != null and tenantId != ''">
             and codeclassify0.tenant_id = #{tenantId}
         </if>
@@ -450,7 +448,6 @@
         <if test="desc != null">
             and  codeclassify0.DESCRIPTION = #{desc}
         </if>
-
         <if test="tenantId != null and tenantId != ''">
           and  codeclassify0.tenant_id = #{tenantId}
         </if>

--
Gitblit v1.9.3