From 96d0fd6fb8e4dfb9763158b4ac89924b27a8db5c Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 15 Jul 2024 16:53:44 +0800
Subject: [PATCH] 项目进度上报逻辑优化及工序配置v0.7
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
index 9c1347c..cc795f1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
@@ -36,7 +36,7 @@
FROM
ywxt.sg_project_info pro
inner JOIN ywxt.sg_device d ON pro.id = d.program_id
- Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type
+ Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type or sgc.gx_device_type in ('sgzb','sgys')
left join ywxt.blade_role ro on ro.id = sgc.role_id
left join ywxt.sg_project_person_config sppc on sgc.role_id = sppc.rold_id and sppc.program_id = pro.id
left join ywxt.blade_user bu on sppc.user_id = bu.id
--
Gitblit v1.9.3