From fccfe7d50f42f5be4c4612d61b7ae852e2ef37cd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 17 四月 2025 15:26:09 +0800
Subject: [PATCH] 优化指派设备与审签设备的权限校验查询，新增导入电子样板触发审签流程，新增电子样板指派设备功能
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 52a9d4c..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
@@ -14,17 +15,19 @@
, p.craft_version
, p.step_type
, p.CREATE_TIME
- , p.create_user
+ , p.create_by
, p.UPDATE_TIME
- , p.update_user
+ , p.update_by
, p.description
, 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