From 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:41:41 +0800
Subject: [PATCH] 1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询

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

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
index 0cb402f..2a8b420 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
@@ -11,10 +11,12 @@
         , p.UPDATE_TIME
         , p.create_by
         , p.update_by
+        , (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_product_info p
         inner join
-        (select distinct product_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
-        on p.product_id = s.product_id
+             (select business_id,business_type from nc_permission_stream_new where delete_flag = 0 and user_id=#{userId}) s
+             on p.product_id = s.business_id and s.business_type='1'
         where p.delete_flag = 0
         order by p.create_time asc
     </select>

--
Gitblit v1.9.3