From 103f52ade0f77e420dec306ea3b51d0a3c0ac3ee Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:23:12 +0800
Subject: [PATCH] art: 设备管理-系统业务编码生成，工艺参数维护功能修改
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
index 476ceec..ecfcb12 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
@@ -7,6 +7,7 @@
, p.product_id
, p.component_id
, p.parts_id
+ , p.psv_id
, p.PROCESS_ID
, p.step_name
, p.step_code
@@ -21,10 +22,12 @@
, p.device_no
, p.assemble_no
, p.assemble_name
+ , (select sys_user.realname from sys_user where p.create_by=sys_user.username) as createName
+ , (select sys_user.realname from sys_user where p.update_by=sys_user.username) as updateName
from nc_work_step p
inner join
- (select distinct step_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
- on p.id = s.step_id
+ (select business_id,business_type from nc_permission_stream_new where delete_flag = 0 and user_id=#{userId}) s
+ on p.id = s.business_id and s.business_type='6'
where p.delete_flag = 0
</select>
</mapper>
--
Gitblit v1.9.3