From efdfc33415d43d2f97cdfa66a48e3713f6c2fd1a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 20:33:39 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
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..676ea36 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