From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置
---
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