From c6a54f63df671de4592e336b9b8cd8406d4e3b51 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 02 六月 2023 16:25:27 +0800
Subject: [PATCH] 解决动态模块冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 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..3238bb9 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,6 +121,9 @@
<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}), '%')
</if>
@@ -141,7 +144,8 @@
PCS.ATTRSORTFIELD,
PCS.WIDTH,
PCS.FIXEDPOSITION,
- PCS.TEMPLET
+ 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}
--
Gitblit v1.9.3