From 2d964c50c7ac6557e968328e5931006686c4cfbb Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 28 十月 2022 12:52:15 +0800
Subject: [PATCH] 解决冲突
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 924fc2e..80657f5 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -59,9 +59,9 @@
FROM
`ums_base_case` AS ubc
JOIN ums_violations AS uv ON ubc.id = uv.id
- JOIN ums_data_dictionary AS t3 ON uv.category_id = t3.id
- JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
- JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
+ LEFT JOIN ums_data_dictionary AS t3 ON uv.category_id = t3.id
+ LEFT JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
+ LEFT JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
<where>
<if test="state!=null">
ubc.state=#{state}
@@ -91,9 +91,9 @@
uib.materials
FROM
`ums_base_case` AS ubc
- JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_id
- JOIN ums_data_dictionary AS t1 ON uib.category_id = t1.id
- JOIN ums_sccg_region t2 ON ubc.community_id = t2.id
+ left JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_id
+ left JOIN ums_data_dictionary AS t1 ON uib.category_id = t1.id
+ left JOIN ums_sccg_region t2 ON ubc.community_id = t2.id
<where>
<if test="state!=null">
ubc.state=#{state}
@@ -116,7 +116,7 @@
usr2.region_name community_text,
ua.username create_user_text
FROM ums_base_case ubc
- LEFT JOIN ums_data_dictionary udd on ubc.category = udd.id and udd.type_code = '01'
+ LEFT JOIN ums_data_dictionary udd on ubc.category = udd.id
LEFT JOIN ums_sccg_region usr on ubc.street_id = usr.id
LEFT JOIN ums_sccg_region usr2 on ubc.community_id = usr2.id
LEFT JOIN ums_admin ua on ubc.create_user = ua.id
--
Gitblit v1.8.0