From 075cc6cdfe236118fcd25dbfa5285aa4c412d342 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 14 十一月 2023 11:21:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 c4e4702..229b39f 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
@@ -38,6 +38,7 @@
<result column="CODEKEYATTRREPEATOID" property="codeKeyAttrRepeatOid"/>
<result column="CODERESEMBLERULEOID" property="codeResembleRuleOid"/>
<result column="TENANT_ID" property="tenantId"/>
+ <result column="TOTAL" property="total"/>
</resultMap>
<sql id="tableName">
@@ -89,12 +90,12 @@
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
+ 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>
1=1
<if test="oid != null and oid != ''">
@@ -504,6 +505,7 @@
start with oid = #{oid}
connect by prior oid = parentcodeclassifyoid;
</select>
+
<select id="selectAllParenClassifytByOid" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
--
Gitblit v1.9.3