From 7c77e020b81e42fb65aa966742ff7c93e73668e1 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 26 五月 2025 17:57:55 +0800
Subject: [PATCH] 设备调拨功能增加
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml | 33 ++++++---------------------------
1 files changed, 6 insertions(+), 27 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 86ba7b2..b09355a 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
@@ -122,12 +122,14 @@
, comp.description
, comp.create_time
, comp.update_time
- , comp.update_user
- , comp.create_user
+ , 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>
@@ -155,28 +157,5 @@
(select distinct component_id, user_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
on comp.component_id=s.component_id
where delete_flag = 0 and parent_id=#{parentId}
- </select>
-
-
- <select id="findById" parameterType="Map" resultMap="componentExtPermsMapAs">
- select comp.component_id
- , comp.parent_id
- , comp.product_id
- , comp.component_name
- , comp.materiel_code
- , comp.materiel_desp
- , comp.component_model
- , comp.component_scale
- , comp.component_weight
- , comp.rank_level
- , comp.assemble_type
- , comp.produce_type
- , comp.process_type
- , comp.structure_type
- , comp.component_code
- , comp.component_status
- , comp.description
- from nc_component_info comp
- where comp.component_id=#{id} and comp.delete_flag=0
</select>
</mapper>
--
Gitblit v1.9.3