From 438b6be5ea9ed484b50a45a0f210b80180473491 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 11 二月 2025 11:51:45 +0800
Subject: [PATCH] dnc与mdc部门进行整合 使用Mdc部门进行处理  修改所属部门为所属车间  修改yml文件数据库地址

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java
index 0c30322..16fc6b2 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java
@@ -5,14 +5,13 @@
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.netty.util.internal.StringUtil;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.activiti.entity.ActivitiDefinition;
 import org.jeecg.modules.activiti.service.IActivitiDefinitionService;
-import org.jeecg.modules.dnc.dto.DepartApproveUser;
+import org.jeecg.modules.dnc.ucenter.DepartApproveUser;
 import org.jeecg.modules.dnc.dto.DepartmentExt;
-import org.jeecg.modules.dnc.dto.DepartmentUser;
+import org.jeecg.modules.dnc.ucenter.DepartmentUser;
 import org.jeecg.modules.dnc.entity.DevicePermissionStream;
 import org.jeecg.modules.dnc.entity.PermissionStream;
 import org.jeecg.modules.dnc.exception.ExceptionCast;
@@ -24,11 +23,8 @@
 import org.jeecg.modules.dnc.service.support.FindsDepartmentChildrenUtil;
 import org.jeecg.modules.dnc.ucenter.Department;
 import org.jeecg.modules.dnc.utils.ValidateUtil;
-import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
 import org.jeecg.modules.system.service.ISysUserService;
-import org.jeecg.modules.system.util.FindsDepartsChildrenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

--
Gitblit v1.9.3