From 02596892e6dda995a5219e2a6fd4ca6d5c437b85 Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期五, 28 二月 2025 15:52:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml | 6 ++++--
1 files changed, 4 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 52a9d4c..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
@@ -14,13 +14,15 @@
, 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
--
Gitblit v1.9.3