From 3ca99a04cff5dc72a8f1a4b4448ca592f915237f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期六, 09 八月 2025 17:47:28 +0800
Subject: [PATCH] 生产管控 排产功能接口调整
---
src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 f00f3a7..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;
@@ -24,8 +23,6 @@
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;
@@ -85,8 +82,8 @@
SysRoleIndexMapper sysRoleIndexMapper;
@Resource
UserFactoryMapper userFactoryMapper;
- @Resource
- MdcUserProductionMapper mdcUserProductionMapper;
+// @Resource
+// MdcUserProductionMapper mdcUserProductionMapper;
@Resource
private ISysDictService sysDictService;
@@ -522,7 +519,7 @@
// 2. 鍒犻櫎鐢ㄦ埛閮ㄩ棬鍏崇郴
line += sysUserDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getUserId, userIds));
// 3. 鍒犻櫎鐢ㄦ埛浜х嚎鍏崇郴
- line += mdcUserProductionMapper.delete(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getUserId, userIds));
+ line += userFactoryMapper.delete(new LambdaQueryWrapper<UserFactory>().in(UserFactory::getUserId, userIds));
//3. 鍒犻櫎鐢ㄦ埛瑙掕壊鍏崇郴
line += sysUserRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, userIds));
//4.鍚屾鍒犻櫎绗笁鏂笰pp鐨勭敤鎴�
@@ -592,8 +589,8 @@
if (oConvertUtils.isNotEmpty(selectedProductions)) {
arr = selectedProductions.split(",");
for (String productionId : arr) {
- MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
- mdcUserProductionMapper.insert(mdcUserProduction);
+ UserFactory mdcUserProduction = new UserFactory(productionId, user.getId());
+ userFactoryMapper.insert(mdcUserProduction);
}
}
//step.5 淇濆瓨璁惧鏉冮檺
@@ -661,13 +658,14 @@
array = productions.split(",");
}
//鍏堝垹鍚庡姞
- mdcUserProductionMapper.delete(new QueryWrapper<MdcUserProduction>().lambda().eq(MdcUserProduction::getUserId, user.getId()));
+ userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
if (oConvertUtils.isNotEmpty(productions)) {
for (String productionId : array) {
- MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
- mdcUserProductionMapper.insert(mdcUserProduction);
+ 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