From 368e938e3ced045d6b8499cdaed7d61a84180a1c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 06 八月 2025 11:12:35 +0800
Subject: [PATCH] 删除原MDC设备车间管理代码
---
src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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..1fd0c21 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
@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
-import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CacheConstant;
@@ -83,6 +82,8 @@
SysRoleIndexMapper sysRoleIndexMapper;
@Resource
UserFactoryMapper userFactoryMapper;
+// @Resource
+// MdcUserProductionMapper mdcUserProductionMapper;
@Resource
private ISysDictService sysDictService;
@@ -587,9 +588,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 +660,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()));
@@ -818,4 +820,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