From 03ab24af158dba0d506569d7e7cf22929ae67296 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 31 一月 2024 16:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 049f925..2305909 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
@@ -60,6 +60,13 @@
PRIOR OID = parentCodeClassifyOid
</select>
+ <select id="selectAllParentOid" resultType="java.lang.String">
+ SELECT oid
+ FROM PL_CODE_CLASSIFY
+ START WITH oid = #{oid}
+ CONNECT BY PRIOR PARENTCODECLASSIFYOID = oid
+ </select>
+
<select id="checkHasChild" resultType="java.lang.Boolean">
<![CDATA[select count(oid)
from PL_CODE_CLASSIFY
@@ -101,7 +108,7 @@
<where>
1=1
<if test="oid != null and oid != ''">
- and codeclassify0.parentcodeclassifyoid = ${oid}
+ and codeclassify0.parentcodeclassifyoid = ${oid}
</if>
<if test="oid = null">
and codeclassify0.parentcodeclassifyoid is null
@@ -110,7 +117,7 @@
and codeclassify0.tenant_id = #{tenantId}
</if>
</where>
- order by lastmodifytime asc
+ order by id asc
</select>
<select id="selectAllLevelChildHasPath" resultMap="plCodeClassifyResultMap">
@@ -313,16 +320,13 @@
left join pl_code_resemblerule coderesembleruleoid
on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
where codeclassify0.lcstatus = #{lcstatus}
- <if test="parentcodeclassifyoid != null and parentcodeclassifyoid != ''">
- and codeclassify0.parentcodeclassifyoid = #{parentcodeclassifyoid}
- </if>
- <if test="parentcodeclassifyoid == null or parentcodeclassifyoid == ''">
- and codeclassify0.parentcodeclassifyoid is null
- and codeclassify0.id = #{id}
- </if>
<if test="tenantId != null and tenantId != ''">
- and codeclassify0.tenant_id = #{tenantId}
+ AND codeclassify0.tenant_id = #{tenantId}
</if>
+ START WITH
+ codeclassify0.ID = #{id}
+ CONNECT BY
+ PRIOR codeclassify0.OID = codeclassify0.parentCodeClassifyOid
order by id asc
</select>
@@ -600,6 +604,5 @@
and isparticipatecheck = 0
and oid != #{currentOid}
</select>
-
</mapper>
--
Gitblit v1.9.3