From 009c2bcdb77a5963a639fcaa5bfd96e068db5546 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 11 二月 2025 17:59:20 +0800
Subject: [PATCH] 设备新增系统类型字段
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml | 10 ++++++++--
1 files changed, 8 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 0b19b27..db50589 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,7 +3,7 @@
<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
@@ -17,10 +17,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
+ on p.id = s.step_id
where p.delete_flag = 0
</select>
</mapper>
--
Gitblit v1.9.3