From b231e345300e34c9c918cbd7e2db44d334eb4937 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期六, 28 六月 2025 21:55:44 +0800
Subject: [PATCH] 供应商管理、线边库管理、产线人员绑定
---
src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 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 35ecc9a..caebf76 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
@@ -85,10 +85,6 @@
UserFactoryMapper userFactoryMapper;
@Resource
private ISysDictService sysDictService;
- @Resource
- private MdcProductionEquipmentMapper mdcProductionEquipmentMapper;
- @Resource
- private DncDevicePermissionMapper dncDevicePermissionMapper;
@Override
@CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -597,16 +593,16 @@
}
}
//step.5 淇濆瓨璁惧鏉冮檺
- List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",arr))
- .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
- if (oConvertUtils.isNotEmpty(EquipmentIds)) {
- for (String equipmentId : EquipmentIds) {
- DncDevicePermission dncDevicePermission=new DncDevicePermission();
- dncDevicePermission.setDeviceId(equipmentId);
- dncDevicePermission.setUserId(user.getId());
- dncDevicePermissionMapper.insert(dncDevicePermission);
- }
- }
+// List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",arr))
+// .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
+// if (oConvertUtils.isNotEmpty(EquipmentIds)) {
+// for (String equipmentId : EquipmentIds) {
+// DncDevicePermission dncDevicePermission=new DncDevicePermission();
+// dncDevicePermission.setDeviceId(equipmentId);
+// dncDevicePermission.setUserId(user.getId());
+// dncDevicePermissionMapper.insert(dncDevicePermission);
+// }
+// }
}
@Override
@@ -670,17 +666,17 @@
}
//step.5 淇敼璁惧鏉冮檺
//鍏堝垹鍚庡姞
- dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
- List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",array))
- .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
- if (oConvertUtils.isNotEmpty(EquipmentIds)) {
- for (String equipmentId : EquipmentIds) {
- DncDevicePermission dncDevicePermission=new DncDevicePermission();
- dncDevicePermission.setDeviceId(equipmentId);
- dncDevicePermission.setUserId(user.getId());
- dncDevicePermissionMapper.insert(dncDevicePermission);
- }
- }
+// dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
+// List<String> EquipmentIds= mdcProductionEquipmentMapper.selectList(new QueryWrapper<MdcProductionEquipment>().in("production_id",array))
+// .stream().map(MdcProductionEquipment::getEquipmentId).collect(Collectors.toList());
+// if (oConvertUtils.isNotEmpty(EquipmentIds)) {
+// for (String equipmentId : EquipmentIds) {
+// DncDevicePermission dncDevicePermission=new DncDevicePermission();
+// dncDevicePermission.setDeviceId(equipmentId);
+// dncDevicePermission.setUserId(user.getId());
+// dncDevicePermissionMapper.insert(dncDevicePermission);
+// }
+// }
//step.6 淇敼鎵嬫満鍙峰拰閭
// 鏇存柊鎵嬫満鍙枫�侀偖绠辩┖瀛楃涓蹭负 null
userMapper.updateNullByEmptyString("email");
@@ -822,4 +818,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