From eec61b51d7b64695d177c7cedd2da49f03f8c26e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 13 三月 2025 16:59:17 +0800
Subject: [PATCH] update
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
index e39af4e..9b7711e 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.system.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,8 +45,6 @@
@Resource
private MdcProductionEquipmentMapper productionEquipmentMapper;
- @Resource
- private DncDeviceGroupPermissionMapper dncDeviceGroupPermissionMapper;
/**
* queryTreeList 瀵瑰簲 queryTreeList 鏌ヨ鎵�鏈夌殑浜х嚎鏁版嵁,浠ユ爲缁撴瀯褰㈠紡鍝嶅簲缁欏墠绔�
*/
@@ -138,13 +137,6 @@
mdcProduction.setOrgType(String.valueOf(orgType));
mdcProduction.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
this.save(mdcProduction);
- //鏂板DNC杞﹂棿鏉冮檺
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- String userId = user.getId();
- DncDeviceGroupPermission dncDeviceGroupPermission=new DncDeviceGroupPermission();
- dncDeviceGroupPermission.setGroupPermId(mdcProduction.getId());
- dncDeviceGroupPermission.setUserId(userId);
- dncDeviceGroupPermissionMapper.insert(dncDeviceGroupPermission);
}
}
@@ -202,6 +194,15 @@
@Override
public List<MdcProduction> queryProdByPid(String pid) {
return this.baseMapper.queryProdByPid(pid);
+ }
+
+ /**
+ * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
+ */
+ @Override
+ public List<MdcProduction> recursionChildrenByPid(String pid){
+ List<String> ids=this.recursionChildren(pid);
+ return super.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString()).in(MdcProduction::getId, ids));
}
/**
@@ -368,4 +369,33 @@
}
return stringList;
}
+
+ /**
+ * 鑾峰彇鐢ㄦ埛宸插垎閰嶇殑閮ㄩ棬鍒楄〃
+ * @param userId
+ * @return
+ */
+ @Override
+ public Map<String, MdcProduction> getUserAssignedDepart(String userId){
+ if(StrUtil.isEmpty(userId))
+ return null;
+ List<MdcProduction> userPermDepart = this.baseMapper.findAllProductionId(userId);
+ if(userPermDepart == null || userPermDepart.isEmpty())
+ return null;
+ Map<String, MdcProduction> map = new HashMap<>();
+ userPermDepart.forEach(item -> {
+ map.put(item.getId(), item);
+ });
+ return map;
+ }
+
+ /**
+ * 閫氳繃涓�缁刬d鑾峰彇閮ㄩ棬
+ * @param ids
+ * @return
+ */
+ @Override
+ public List<String> findAllProductionIds(List<String> ids){
+ return this.baseMapper.recursionChildrenByList(ids);
+ }
}
--
Gitblit v1.9.3