From 42e68faca0756d44b7c880c9876810ee47d6e92b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 17 二月 2025 17:57:25 +0800
Subject: [PATCH] 1.DNC模块，设备结构树权限分配优化与修改bug 2.MDC模块，设备编辑车间同步平移设备send目录 3.优化原有指派设备代码
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamServiceImpl.java
index 9f8de34..b5011d4 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PermissionStreamServiceImpl.java
@@ -138,12 +138,24 @@
@Override
public List<PermissionStream> getByProcessId(String productId, String componentId, String partsId, String processId){
- if(!ValidateUtil.validateString(productId) || !ValidateUtil.validateString(componentId)
- || !ValidateUtil.validateString(partsId) || !ValidateUtil.validateString(processId))
+ List<PermissionStream> list = super.lambdaQuery()
+ .eq(StrUtil.isNotEmpty(productId),PermissionStream::getProductId, productId)
+ .eq(StrUtil.isNotEmpty(componentId),PermissionStream::getComponentId, componentId)
+ .eq(StrUtil.isNotEmpty(partsId),PermissionStream::getPartsId, partsId)
+ .eq(StrUtil.isNotEmpty(processId),PermissionStream::getProcessId,processId).list();
+ if(list == null || list.isEmpty())
return null;
- List<PermissionStream> list = super.lambdaQuery().eq(PermissionStream::getProductId, productId).
- isNull(PermissionStream::getUserId).eq(PermissionStream::getComponentId, componentId)
- .eq(PermissionStream::getPartsId, partsId).eq(PermissionStream::getProcessId,processId).list();
+ return list;
+ }
+
+ @Override
+ public List<PermissionStream> getByStepId(String productId, String componentId, String partsId,String processId,String stepId){
+ List<PermissionStream> list = super.lambdaQuery()
+ .eq(StrUtil.isNotEmpty(productId),PermissionStream::getProductId, productId)
+ .eq(StrUtil.isNotEmpty(componentId),PermissionStream::getComponentId, componentId)
+ .eq(StrUtil.isNotEmpty(partsId),PermissionStream::getPartsId, partsId)
+ .eq(StrUtil.isNotEmpty(processId),PermissionStream::getProcessId,processId)
+ .eq(StrUtil.isNotEmpty(stepId),PermissionStream::getStepId,stepId).list();
if(list == null || list.isEmpty())
return null;
return list;
--
Gitblit v1.9.3