From e51c7d378341e4b8d1529947c2c25f5c10701de9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 13 五月 2025 15:45:23 +0800
Subject: [PATCH] art: 设备管理-设备台账-新增、列表修改
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 0b19b27..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
@@ -3,10 +3,11 @@
<mapper namespace="org.jeecg.modules.dnc.mapper.WorkStepMapper">
<select id="getByUserPerms" resultType="org.jeecg.modules.dnc.entity.WorkStep">
select
- p.step_id
+ p.id
, p.product_id
, p.component_id
, p.parts_id
+ , p.psv_id
, p.PROCESS_ID
, p.step_name
, p.step_code
@@ -17,10 +18,16 @@
, p.create_by
, p.UPDATE_TIME
, 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.step_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