From 93e2df19d543dbf2cd806ab205efd20be9f71111 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 06 六月 2023 16:48:00 +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 | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 3238bb9..abccd66 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
@@ -121,12 +121,18 @@
<if test="codeReferConfig.tenantId != null and codeReferConfig.tenantId != ''">
PCR.TENANTID = #{codeReferConfig.tenantId}
</if>
+<<<<<<< Updated upstream
<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}), '%')
</if>
+=======
+ <if test="codeReferConfig.name != null and codeReferConfig.name != ''">
+ and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
+ </if>
+>>>>>>> Stashed changes
<if test="codeReferConfig.id != null and codeReferConfig.id != ''">
and ID like CONCAT(CONCAT('%', #{codeReferConfig.id}), '%')
</if>
@@ -144,8 +150,12 @@
PCS.ATTRSORTFIELD,
PCS.WIDTH,
PCS.FIXEDPOSITION,
+<<<<<<< Updated upstream
PCS.TEMPLET,
PCS.ISQUERY
+=======
+ PCS.TEMPLET
+>>>>>>> Stashed changes
FROM PL_CODE_REFERCONFIG PCR
LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
temp WHERE temp.REFERCONFIGOID = #{oid}
--
Gitblit v1.9.3