From cc44920da3d40b8248b67560026e891afdd1a6ab Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 08 五月 2025 17:57:14 +0800
Subject: [PATCH] 1.查询可以被引用的部件接口开发完成 2.借用部件(可批量) 开发完成 3.修改原有新增、修改部件接口 完成 4.修改原有删除文档与导入文档接口 完成 5.修改工作流问题
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml
index b3ab01a..d7bb478 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceGroupMapper.xml
@@ -15,7 +15,7 @@
from nc_device_group where rank_level=1 and delete_flag=0
</select>
<select id="findExtByDeparts" resultMap="deviceGroupExtBaseResult" parameterType="List">
- select dg.group_id
+ select DISTINCT dg.group_id
, dg.group_name
, dg.parent_id
, dg.rank_level
@@ -77,8 +77,8 @@
, comp.description
, comp.CREATE_TIME
, comp.UPDATE_TIME
- , comp.CREATE_USER
- , comp.UPDATE_USER
+ , comp.create_by
+ , comp.update_by
from nc_device_group comp
inner join
(select distinct group_id from nc_device_permission_stream where delete_flag = 0 and user_id=#{userId}) s
--
Gitblit v1.9.3