From 904727f59b7e10a291ce7d1576e33192a619f2f2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 05 八月 2025 17:08:39 +0800
Subject: [PATCH] MDC设备树和设备权限改造

---
 src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index caebf76..b38d527 100644
--- a/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -24,6 +24,8 @@
 import org.jeecg.modules.base.entity.UserFactory;
 import org.jeecg.modules.base.mapper.UserFactoryMapper;
 import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.mdc.entity.MdcUserProduction;
+import org.jeecg.modules.mdc.mapper.MdcUserProductionMapper;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
@@ -83,6 +85,8 @@
 	SysRoleIndexMapper sysRoleIndexMapper;
 	@Resource
 	UserFactoryMapper userFactoryMapper;
+	@Resource
+	MdcUserProductionMapper mdcUserProductionMapper;
 	@Resource
 	private ISysDictService sysDictService;
 
@@ -587,9 +591,9 @@
 		//step.4 淇濆瓨鎵�灞炰骇绾�
 		if (oConvertUtils.isNotEmpty(selectedProductions)) {
 			arr = selectedProductions.split(",");
-			for (String factoryId : arr) {
-				UserFactory userFactory = new UserFactory(user.getId(), factoryId);
-				userFactoryMapper.insert(userFactory);
+			for (String productionId : arr) {
+				UserFactory mdcUserProduction = new UserFactory(productionId, user.getId());
+				userFactoryMapper.insert(mdcUserProduction);
 			}
 		}
 		//step.5 淇濆瓨璁惧鏉冮檺
@@ -659,11 +663,12 @@
 		//鍏堝垹鍚庡姞
 		userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
 		if (oConvertUtils.isNotEmpty(productions)) {
-			for (String factoryId : array) {
-				UserFactory userFactory = new UserFactory(user.getId(), factoryId);
-				userFactoryMapper.insert(userFactory);
+			for (String productionId : array) {
+				UserFactory mdcUserProduction = new UserFactory(productionId, user.getId());
+				userFactoryMapper.insert(mdcUserProduction);
 			}
 		}
+
 		//step.5 淇敼璁惧鏉冮檺
 		//鍏堝垹鍚庡姞
 //		dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));

--
Gitblit v1.9.3