From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 01 六月 2023 18:49:05 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
index f030ee1..503dc2f 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
@@ -31,7 +31,7 @@
<result column="COPYFROMVERSION" property="copyFromVersion"/>
<result column="CLASSNAME" property="className"/>
<result column="NODELINK" property="nodeLink"/>
- <result column="NODELINKNAME" property="getNodeLinkName"/>
+ <result column="NODELINKNAME" property="nodeLinkName"/>
<result column="PID" property="pid"/>
</resultMap>
<select id="selectCompanyGroupClassifyVOByTree" resultMap="plDockingClassifyResultMap">
@@ -67,14 +67,16 @@
codeclassify0.NODELINKNAME as nodelinkname,
codeclassify0.PID as pid
from PL_CODE_JCLASSIFY codeclassify0
- <where>
- <if test="oid != null and oid != ''">
- codeclassify0.pid = '${oid}'
+ start with
+ <!--<where>-->
+ <if test="oid != null">
+ codeclassify0.pid = '${oid}'
</if>
- <if test="oid = null">
+ <if test="oid == null ">
codeclassify0.pid is null
</if>
- </where>
+ <!--</where>-->
+ connect by prior codeclassify0.oid =codeclassify0.pid
order by id asc
</select>
--
Gitblit v1.9.3