From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml
index ea76ced..67869a6 100644
--- a/java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportCustomComponentRelV1ServiceDaoImplMapper.xml
@@ -19,13 +19,16 @@
<select id="getReportCustomComponentRelInfo" parameterType="Map" resultType="Map">
select t.rel_id,t.rel_id relId,t.component_id,t.component_id componentId,t.status_cd,t.status_cd
statusCd,t.custom_id,t.custom_id customId,t.seq,cc.`name` componentName,t.create_time createTime,
- cc.component_type componentType,cc.java_script javaScript,cc.component_group
- componentGroup,cc.query_model queryModel,cc.component_sql componentSql
+ cc.component_type componentType,cc.component_group
+ componentGroup,cc.query_model queryModel
from report_custom_component_rel t
left join report_custom_component cc on t.component_id = cc.component_id and cc.status_cd = '0'
where 1 =1
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
+ </if>
+ <if test="componentType !=null and componentType != ''">
+ and cc.component_type= #{componentType}
</if>
<if test="componentId !=null and componentId != ''">
and t.component_id= #{componentId}
@@ -73,10 +76,14 @@
<select id="queryReportCustomComponentRelsCount" parameterType="Map" resultType="Map">
select count(1) count
from report_custom_component_rel t
+ left join report_custom_component cc on t.component_id = cc.component_id and cc.status_cd = '0'
where 1 =1
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
</if>
+ <if test="componentType !=null and componentType != ''">
+ and cc.component_type= #{componentType}
+ </if>
<if test="componentId !=null and componentId != ''">
and t.component_id= #{componentId}
</if>
--
Gitblit v1.8.0