From c84991603548ca07bdcb589bf61ab230a6fb9f3e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 九月 2023 13:57:52 +0800
Subject: [PATCH] getCodeRuleByClassifyOid接口修改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
index 6216656..4546f83 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
@@ -115,11 +115,14 @@
     <!--鏌ヨ鎸囧畾琛屾暟鎹�-->
     <select id="selectJoinPage" resultMap="CodeReferconfigMap">
         SELECT
-            PCR.*
+        PCR.*
         FROM PL_CODE_REFERCONFIG PCR
         <where>
             <if test="codeReferConfig.tenantId != null and codeReferConfig.tenantId != ''">
                 PCR.TENANTID = #{codeReferConfig.tenantId}
+            </if>
+            <if test="codeReferConfig.isOpenGlobal != null and codeReferConfig.isOpenGlobal != ''">
+                OR PCR.ISOPENGLOBAL = #{codeReferConfig.isOpenGlobal}
             </if>
             <if test="codeReferConfig.name != null and codeReferConfig.name != ''">
                 and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
@@ -132,32 +135,33 @@
 
     <select id="selectShowFieldByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeShowFieldConfig">
         SELECT temp.* FROM (
-            SELECT
-                PCS.REFERCONFIGOID,
-                PCS.FIELD,
-                PCS.TITLE,
-                PCS.FIELDTYPE,
-                PCS.SORT,
-                PCS.ATTRSORTFIELD,
-                PCS.WIDTH,
-                PCS.FIXEDPOSITION,
-                PCS.TEMPLET
-            FROM PL_CODE_REFERCONFIG PCR
-                LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
-            temp WHERE temp.REFERCONFIGOID = #{oid}
+           SELECT
+               PCS.REFERCONFIGOID,
+               PCS.FIELD,
+               PCS.TITLE,
+               PCS.FIELDTYPE,
+               PCS.SORT,
+               PCS.ATTRSORTFIELD,
+               PCS.WIDTH,
+               PCS.FIXEDPOSITION,
+               PCS.TEMPLET,
+               PCS.ISQUERY
+           FROM PL_CODE_REFERCONFIG PCR
+                LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID
+        )temp WHERE temp.REFERCONFIGOID = #{oid}
     </select>
 
     <select id="selectSrchCondByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeSrchCondConfig">
         SELECT temp.*
-            FROM
+        FROM
             (SELECT
-                PCSR.FILTERFIELD,
-                PCSR.FILTERTYPE,
-                PCSR.FILTERVALUE,
-                PCSR.REFERCONFIGOID
-            FROM PL_CODE_REFERCONFIG PCR
-                     LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
-            temp WHERE temp.REFERCONFIGOID = #{oid}
+                 PCSR.FILTERFIELD,
+                 PCSR.FILTERTYPE,
+                 PCSR.FILTERVALUE,
+                 PCSR.REFERCONFIGOID
+             FROM PL_CODE_REFERCONFIG PCR
+                      LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
+                temp WHERE temp.REFERCONFIGOID = #{oid}
     </select>
 
 </mapper>

--
Gitblit v1.9.3