From 833035bc5026f12acb8f7e1428280d0a9f204b08 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 15 一月 2025 14:37:03 +0800
Subject: [PATCH] 设备特殊字符管理  工步新增字段

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml |   12 ++++++++----
 1 files changed, 8 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 0b19b27..52a9d4c 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
@@ -14,13 +14,17 @@
              , p.craft_version
              , p.step_type
              , p.CREATE_TIME
-             , p.create_by
+             , p.create_user
              , p.UPDATE_TIME
-             , p.update_by
+             , p.update_user
+             , p.description
+             , p.device_no
+             , p.assemble_no
+             , p.assemble_name
         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