From affff835d01de682a503eee8b71d48bf35255a50 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 25 May 2023 15:20:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index 285a294..71dde4f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -38,27 +38,27 @@
left join (
select "res_guid",WM_Concat("user_unit") "user_unit",WM_Concat("user_name") "user_name",WM_Concat("user_phone") "user_phone",WM_Concat("position") "position"
- from "SJZT_MD"."tb_res_manage_person" where "type"=1 GROUP BY "res_guid"
+ from "SJZT_MD"."att_res_manage_person" where "type"=1 GROUP BY "res_guid"
) trmp1 on arb."guid" = trmp1."res_guid"
left join (
select "res_guid",WM_Concat("user_unit") "user_unit",WM_Concat("user_name") "user_name",WM_Concat("user_phone") "user_phone",WM_Concat("position") "position"
- from "SJZT_MD"."tb_res_manage_person" where "type"=2 GROUP BY "res_guid"
+ from "SJZT_MD"."att_res_manage_person" where "type"=2 GROUP BY "res_guid"
) trmp2 on arb."guid" = trmp2."res_guid"
left join (
select "res_guid",WM_Concat("user_unit") "user_unit",WM_Concat("user_name") "user_name",WM_Concat("user_phone") "user_phone",WM_Concat("position") "position"
- from "SJZT_MD"."tb_res_manage_person" where "type"=3 GROUP BY "res_guid"
+ from "SJZT_MD"."att_res_manage_person" where "type"=3 GROUP BY "res_guid"
) trmp3 on arb."guid" = trmp3."res_guid"
left join (
select "res_guid",WM_Concat("user_unit") "user_unit",WM_Concat("user_name") "user_name",WM_Concat("user_phone") "user_phone",WM_Concat("position") "position"
- from "SJZT_MD"."tb_res_manage_person" where "type"=4 GROUP BY "res_guid"
+ from "SJZT_MD"."att_res_manage_person" where "type"=4 GROUP BY "res_guid"
) trmp4 on arb."guid" = trmp4."res_guid"
left join (
select "res_guid",WM_Concat("user_unit") "user_unit",WM_Concat("user_name") "user_name",WM_Concat("user_phone") "user_phone",WM_Concat("position") "position"
- from "SJZT_MD"."tb_res_manage_person" where "type"=5 GROUP BY "res_guid"
+ from "SJZT_MD"."att_res_manage_person" where "type"=5 GROUP BY "res_guid"
) trmp5 on arb."guid" = trmp5."res_guid"
where 1=1
<if test="params.name !=null and params.name !=''">
@@ -114,7 +114,7 @@
trmp."user_unit" as unitName,
trmp."position",
trmp."user_phone" as phone
- from "SJZT_MD"."tb_res_manage_person" trmp
+ from "SJZT_MD"."att_res_manage_person" trmp
where trmp."res_guid" = #{guid}
</select>
--
Gitblit v1.9.3