From 0bbd986930e4b41e0741fd07c4287208da398330 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 01 八月 2025 17:03:37 +0800
Subject: [PATCH] art: 生产订单同步定时任务

---
 src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 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 89a4838..f00f3a7 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;
 
@@ -518,7 +522,7 @@
 		// 2. 鍒犻櫎鐢ㄦ埛閮ㄩ棬鍏崇郴
 		line += sysUserDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getUserId, userIds));
 		// 3. 鍒犻櫎鐢ㄦ埛浜х嚎鍏崇郴
-		line += userFactoryMapper.delete(new LambdaQueryWrapper<UserFactory>().in(UserFactory::getUserId, userIds));
+		line += mdcUserProductionMapper.delete(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getUserId, userIds));
 		//3. 鍒犻櫎鐢ㄦ埛瑙掕壊鍏崇郴
 		line += sysUserRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, userIds));
 		//4.鍚屾鍒犻櫎绗笁鏂笰pp鐨勭敤鎴�
@@ -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) {
+				MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
+				mdcUserProductionMapper.insert(mdcUserProduction);
 			}
 		}
 		//step.5 淇濆瓨璁惧鏉冮檺
@@ -657,11 +661,11 @@
 			array = productions.split(",");
 		}
 		//鍏堝垹鍚庡姞
-		userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
+		mdcUserProductionMapper.delete(new QueryWrapper<MdcUserProduction>().lambda().eq(MdcUserProduction::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) {
+				MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
+				mdcUserProductionMapper.insert(mdcUserProduction);
 			}
 		}
 		//step.5 淇敼璁惧鏉冮檺
@@ -818,4 +822,16 @@
 	public IPage<SysUser> getUserByGroupId(Page<SysUser> page, String groupId, String username) {
 		return userMapper.getUserByGroupId(page,groupId,username);
 	}
+
+	/**
+	 * 鏍规嵁浜х嚎Id鏌ヨ
+	 * @param page
+	 * @param factoryId 鐝粍id
+	 * @param username 鐢ㄦ埛璐︽埛鍚嶇О
+	 * @return
+	 */
+	@Override
+	public IPage<SysUser> getUserByFactoryId(Page<SysUser> page, String factoryId, String username) {
+		return userMapper.getUserByFactoryId(page,factoryId,username);
+	}
 }

--
Gitblit v1.9.3