From f6f5e4a28931bdd49b9d0d593d42ef6a291e0f86 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期六, 09 九月 2023 09:14:07 +0800
Subject: [PATCH] 1、租户拼接问题修改。 2、http请求头加鉴权失败问题修改。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 201 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 196 insertions(+), 5 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 dce9452..69dba1b 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
@@ -40,8 +40,15 @@
<result column="TENANT_ID" property="tenantId"/>
</resultMap>
+ <sql id="tableName">
+ pl_code_classify
+ </sql>
+
<select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
- select * from PL_CODE_CLASSIFY where is_deleted = 0
+ select * from PL_CODE_CLASSIFY where
+ <if test="tenantId != null and tenantId != ''">
+ tenant_id = #{tenantId}
+ </if>
</select>
<select id="selectAllLevelChildOid" resultType="java.util.HashMap">
@@ -99,7 +106,7 @@
codeclassify0.tenant_id = #{tenantId}
</if>
</where>
- order by id asc
+ order by lastmodifytime asc
</select>
<select id="selectAllLevelChildHasPath" resultMap="plCodeClassifyResultMap">
@@ -204,7 +211,6 @@
CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
</select>
-
<select id="selectByFieldNamePath" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
codeclassify0.BTMTYPEID as btmtypeid,
@@ -235,7 +241,6 @@
SYS_CONNECT_BY_PATH(id, '#') as paths
</otherwise>
</choose>
-
from pl_code_classify plcodeclassify
START WITH parentCodeClassifyOid is null
CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
@@ -301,7 +306,7 @@
<if test="tenantId != null and tenantId != ''">
and codeclassify0.tenant_id = #{tenantId}
</if>
- order by id asc
+ order by lastmodifytime desc
</select>
<select id="selectClassifyByKeyAndReseRel" resultMap="plCodeClassifyResultMap">
@@ -319,4 +324,190 @@
WHERE PCC.OID IN (${oids})
</select>
+ <select id="selectCodeClassifyDOByParentId" 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,
+ codeclassify0.TENANT_ID as tenantId ,
+ 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 1=1
+ <if test="parentOid != null and parentOid != ''">
+ and codeclassify0.parentcodeclassifyoid = #{parentOid}
+ </if>
+ <if test="parentOid == null or parentOid == ''">
+ and codeclassify0.parentcodeclassifyoid is null
+ </if>
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
+ </if>
+ order by id asc
+ </select>
+
+ <select id="getRMLibByName" 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,
+ codeclassify0.TENANT_ID as tenantId ,
+ 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}
+ and codeclassify0.parentcodeclassifyoid is null
+ <if test="libNames != null and ! libNames.isEmpty() and libNames.size() > 0">
+ and codeclassify0.name in
+ <foreach item="item" index="index" collection="libNames" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
+ </if>
+ order by id asc
+ </select>
+
+ <select id="getRMTypeByDesc" 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,
+ codeclassify0.TENANT_ID as tenantId ,
+ 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 1=1 and codeclassify0.lcstatus = #{lcstatus}
+ <if test="desc != null">
+ and codeclassify0.DESCRIPTION = #{desc}
+ </if>
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
+ </if>
+ order by id asc
+ </select>
+
+ <select id="selectAllParenClassifytByOid" 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,
+ codeclassify0.TENANT_ID as tenantId ,
+ 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
+ start with codeclassify0.oid=#{oid}
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
+ </if>
+ connect by prior PARENTCODECLASSIFYOID = codeclassify0.oid
+ </select>
+
+ <select id="selectStartWithCurrentOid" resultMap="plCodeClassifyResultMap">
+ select * from <include refid="tableName"/>
+ start with oid = #{oid}
+ connect by prior oid = parentcodeclassifyoid;
+ </select>
+
+ <update id="batchUpdateLcStatus" parameterType="java.util.List">
+ BEGIN
+ <foreach collection="records" item="item" index="index" separator=";">
+ update <include refid="tableName"/> set
+ lcstatus = #{item.lcStatus},
+ ts = #{item.ts},
+ lastModifyTime = #{item.lastModifyTime},
+ lastModifier = #{item.lastModifier}
+ where oid = #{item.oid,jdbcType=VARCHAR}
+ </foreach>
+ ;END;
+ </update>
</mapper>
--
Gitblit v1.9.3