From eb0760c36778d07c0d13d917c0db30dfa03aa0fd Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 15 Jul 2024 11:45:46 +0800
Subject: [PATCH] 项目进度上报逻辑优化及工序配置v0.4

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxRoleMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxRoleMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxRoleMapper.xml
index 5b9ba8a..d223de4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxRoleMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxRoleMapper.xml
@@ -19,7 +19,12 @@
 
     </select>
     <select id="getSgGxRoles" resultType="java.lang.String">
-        select role_id  from  YWXT.SG_GX_CONFIG  where gx_device_type = #{gxDeviceType} and  gx_step_id = #{gxStepId} order by sg_order asc
+        select role_id  from  YWXT.SG_GX_CONFIG  where gx_device_type = #{gxDeviceType}
+
+         <if test="gxStepId !=null and gxStepId !=''">
+             and  gx_step_id = #{gxStepId}
+         </if>
+         order by sg_order asc
 
     </select>
 </mapper>

--
Gitblit v1.9.3