From b864148d2a9afd5e1627b761da923cca8f8dfbd2 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 07 三月 2025 14:44:56 +0800
Subject: [PATCH] 修改产品结构树新增删除同步结构树表,新增刀具信息与设备类

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
index f39990c..d31a3cb 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
@@ -124,10 +124,12 @@
         , comp.update_time
         , comp.update_by
         , comp.create_by
+        , (select sys_user.realname from sys_user where comp.create_by=sys_user.username) as createName
+        , (select sys_user.realname from sys_user where comp.update_by=sys_user.username) as updateName
         from nc_component_info comp
         inner join
-        (select distinct component_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
-        on comp.component_id=s.component_id
+             (select business_id,business_type from nc_permission_stream_new where delete_flag = 0 and user_id=#{userId}) s
+             on comp.component_id = s.business_id and s.business_type='2'
         where delete_flag = 0
     </select>
 

--
Gitblit v1.9.3