From 095c79efb36c7fae5672fa0b2481c6b688cba7eb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 21 七月 2023 17:32:02 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 56 ++++++++++++--------------------------------------------
1 files changed, 12 insertions(+), 44 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 027e480..dce9452 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
@@ -37,8 +37,8 @@
<result column="CODERULEOID" property="codeRuleOid"/>
<result column="CODEKEYATTRREPEATOID" property="codeKeyAttrRepeatOid"/>
<result column="CODERESEMBLERULEOID" property="codeResembleRuleOid"/>
+ <result column="TENANT_ID" property="tenantId"/>
</resultMap>
-
<select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
select * from PL_CODE_CLASSIFY where is_deleted = 0
@@ -77,6 +77,7 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -93,6 +94,9 @@
</if>
<if test="oid = null">
codeclassify0.parentcodeclassifyoid is null
+ </if>
+ <if test="tenantId != null and tenantId != ''">
+ codeclassify0.tenant_id = #{tenantId}
</if>
</where>
order by id asc
@@ -125,6 +129,9 @@
<choose>
<when test='fieldInPath=="name"'>
SYS_CONNECT_BY_PATH(codeclassify0.name, '#') as path
+ </when>
+ <when test='fieldInPath=="oid"'>
+ SYS_CONNECT_BY_PATH(codeclassify0.oid, '#') as path
</when>
<otherwise>
SYS_CONNECT_BY_PATH(codeclassify0.id, '#') as path
@@ -167,7 +174,6 @@
level from pl_code_classify start with oid= #{oid} connect by prior PARENTCODECLASSIFYOID = oid
</select>
-
<select id="getIdPathToNamePathByParentId" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
@@ -194,9 +200,8 @@
SYS_CONNECT_BY_PATH(name, '#') as namePath,
SYS_CONNECT_BY_PATH(id, '#') as idPath
from pl_code_classify plcodeclassify
- START WITH parentCodeClassifyOid is null
+ START WITH oid = #{parentId}
CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
- where codeclassify0.paths =#{fieldPath}
</select>
@@ -274,6 +279,7 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -292,46 +298,8 @@
and codeclassify0.parentcodeclassifyoid is null
and codeclassify0.id = #{id}
</if>
- order by id asc
- </select>
-
- <select id="selectCodeClassifyDOByTree" resultMap="plCodeClassifyResultMap">
- select codeclassify0.OWNER as owner,
- codeclassify0.BTMTYPEID as btmtypeid,
- codeclassify0.CREATOR as creator,
- codeclassify0.CREATETIME as createtime,
- codeclassify0.LASTMODIFIER as lastmodifier,
- codeclassify0.DESCRIPTION as description,
- codeclassify0.ORDERNUM as ordernum,
- codeclassify0.CODERULEOID as coderuleoid,
- codeclassify0.OID as oid,
- codeclassify0.BTMNAME as btmname,
- codeclassify0.BTMTYPENAME as btmtypename,
- codeclassify0.CODEKEYATTRREPEATOID as codekeyattrrepeatoid,
- codeclassify0.PARENTCODECLASSIFYOID as parentcodeclassifyoid,
- codeclassify0.NAME as name,
- codeclassify0.LASTMODIFYTIME as lastmodifytime,
- codeclassify0.ID as id,
- codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
- codeclassify0.LCSTATUS as lcstatus,
- codeclassify0.TS as ts,
- coderuleoid.name as codeRuleOidName,
- codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
- coderesembleruleoid.name as codeResembleRuleOidName
- from pl_code_classify codeclassify0
- left join pl_code_rule coderuleoid
- on codeclassify0.codeRuleOid = coderuleoid.oid
- left join pl_code_keyattrrepeat codekeyattrrepeatoid
- on codeclassify0.codeKeyAttrRepeatOid = codekeyattrrepeatoid.oid
- 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 test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
</if>
order by id asc
</select>
--
Gitblit v1.9.3