From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
index 8eba162..a585c28 100644
--- a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
@@ -21,7 +21,7 @@
SELECT
t2.category,
t2.event_source,
- t2.id as baseId,
+ t2.code as code,
t1.id,
t3.region_name,
t1.create_time,
@@ -31,8 +31,11 @@
LEFT JOIN ums_base_case t2 ON t1.belong_to_id = t2.id
LEFT JOIN ums_sccg_region t3 on t3.id=t2.community_id
<where>
- <if test="type != '' and type != null">
- t1.type=#{type}
+ <if test="type == '03' and type != null and type !='' ">
+ t1.type='03'
+ </if>
+ <if test="type == '01' and type != null and type !='' ">
+ t1.type='02' or t1.type='01'
</if>
<if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
and t1.create_time between #{startTime} and #{endTime}
--
Gitblit v1.8.0