From b42b180f5c2bc89e494b2274d8d454a4bd6dbf9c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 21 三月 2025 17:27:59 +0800
Subject: [PATCH] art: 系统管理-用户管理-添加选择设备，并根据是否有设备管理模块功能区分加载 哪个模块的设备倏
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
index 46cae6f..6184958 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
@@ -20,15 +20,13 @@
,u.UPDATE_TIME
,u.update_by
,(case when o.doc_id is null then 1 else 2 end) as pullStatus
- ,s.realname as pullUser
+ ,o.create_by as pullUser
from (select classification_id, doc_id,attribution_type,attribution_id from nc_doc_relative where delete_flag=0) r
inner join
(select * from nc_doc_info where delete_flag=0) u
on r.doc_id = u.doc_id
left join (select doc_id, create_by from nc_file_operate where delete_flag=0) o
on u.doc_id=o.doc_id
- left join sys_user s
- on o.create_by=s.id
${ew.customSqlSegment}
</select>
@@ -52,7 +50,7 @@
,u.UPDATE_TIME
,u.update_by
,(case when o.doc_id is null then 1 else 2 end) as pullStatus
- ,s.realname as pullUser
+ ,o.create_by as pullUser
,(case when t.sync_flag is null then 2 else t.sync_flag end) as syncStatus
from (select classification_id, doc_id,attribution_type,attribution_id from nc_doc_relative where delete_flag=0) r
inner join
@@ -60,8 +58,6 @@
on r.doc_id = u.doc_id
left join (select doc_id, create_by from nc_file_operate where delete_flag=0) o
on u.doc_id=o.doc_id
- left join sys_user s
- on o.create_by=s.id
left join (select distinct file_id, doc_id, device_id, sync_flag from nc_to_equipment_lists where delete_flag = 0) t
on u.doc_id=t.doc_id and u.publish_file_id=t.file_id and r.attribution_id=t.device_id
${ew.customSqlSegment}
--
Gitblit v1.9.3