From ce567eb11cd0cdbd826214c355d1a8caff175dca Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:22 +0800
Subject: [PATCH] bug列表：181（修复新增，修改，删除接口，新增时没设置默认值，导致在建分类时无法查询到，关键属性查重规则）183（历史数据导入模板下载，过滤掉模板中配置的默认属性）
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 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 84455f7..a604bf7 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
@@ -111,6 +111,7 @@
order by lastmodifytime asc
</select>
+ <!--codeclassify0.parentCodeClassifyOid = '${oid}'-->
<select id="selectAllLevelChildHasPath" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
@@ -155,10 +156,13 @@
on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
START WITH
<if test="oid != null ">
- codeclassify0.parentCodeClassifyOid = '${oid}'
+ codeclassify0.parentCodeClassifyOid = #{oid}
</if>
<if test="oid == null ">
codeclassify0.parentCodeClassifyOid is null
+ </if>
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
</if>
CONNECT BY PRIOR codeclassify0.OID = codeclassify0.parentCodeClassifyOid
</select>
@@ -295,28 +299,7 @@
codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
- coderesembleruleoid.name as codeResembleRuleOidName,
- (
- SELECT
- COUNT(*)
- FROM
- PLBT_CODE_part
- WHERE
- CODECLSFID IN (
- SELECT
- oid
- FROM
- PL_CODE_CLASSIFY
- WHERE
- lcstatus = 'Enabled'
- START WITH
- OID = codeclassify0.OID
- CONNECT BY
- PRIOR OID = parentCodeClassifyOid
- )
- AND lastr = '1'
- AND lastv = '1'
- ) AS total
+ coderesembleruleoid.name as codeResembleRuleOidName
from pl_code_classify codeclassify0
left join pl_code_rule coderuleoid
on codeclassify0.codeRuleOid = coderuleoid.oid
@@ -482,9 +465,10 @@
</if>
order by id asc
</select>
+
<!--鑾峰彇鎵�鏈変笅绾ц妭鐐�,涓嶈鍔ㄨ繖涓柟娉晄ql-->
<select id="selectAllClassifyByOid" resultMap="plCodeClassifyResultMap">
- select codeclassify0.OWNER as owner,
+ select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
codeclassify0.CREATOR as creator,
codeclassify0.CREATETIME as createtime,
--
Gitblit v1.9.3