From 3fe2d018ee29675c724feedf1fed2c8c5f5e38b2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 17 七月 2024 12:51:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index f6e4196..6633131 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -284,14 +284,14 @@
right join (
select distinct process,teams from
( select distinct rw.this_process as process,rw.teams_groups_name as teams
- from reporting_work as rw where rw.process_id='NG24071501A002'
+ from reporting_work as rw where rw.process_id=#{processIdStr}
) as t
) as rw
on rw.process=bd.basic_name
WHERE
bdp.basic_type = 'teamsgroups'
- GROUP BY rw.teams
+ GROUP BY rw.process,rw.teams
</select>
<select id="SelectHistoryProcessMp">
--
Gitblit v1.8.0