From 3302ff7054d02f6b21452f2f2cd3658c8cad6b53 Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期四, 20 二月 2025 10:36:23 +0800
Subject: [PATCH] 增加工序工步用户权限
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java | 5 +++++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 20 +++++---------------
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java | 20 --------------------
3 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
index 414797d..a7b5a5e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/PartsInfoServiceImpl.java
@@ -84,15 +84,6 @@
if(componentInfo == null)
ExceptionCast.cast(PartsInfoCode.PARTS_COMPONENT_NONE);
partsInfo.setPartsStatus(1);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("闆朵欢鍚嶇О锛�"+partsInfo.getPartsName()+"锛岄浂浠朵唬鍙凤細"+partsInfo.getPartsCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.save(partsInfo);
List<PermissionStream> oldDepartPermList = permissionStreamService.getByComponentId(componentInfo.getProductId(), componentInfo.getComponentId());
if(oldDepartPermList != null && !oldDepartPermList.isEmpty()) {
@@ -129,23 +120,12 @@
b = partsPermissionService.save(permission);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
-// if(!b)
-// ExceptionCast.cast(CommonCode.FAIL);
//娣诲姞鐢ㄦ埛鏉冮檺
PermissionStream stream = new PermissionStream();
stream.setProductId(partsInfo.getProductId());
stream.setComponentId(partsInfo.getComponentId());
stream.setPartsId(partsInfo.getPartsId());
stream.setUserId(userId);
-// //娣诲姞鏃ュ織
-// NcLogInfo ncLogInfogx = new NcLogInfo();
-// //妯″潡
-// ncLogInfogx.setModuleInfo("浜у搧缁撴瀯鏍�");
-// //绫诲瀷
-// ncLogInfogx.setOperateType(2);
-// //鏃ュ織鍐呭
-// ncLogInfogx.setLogContent("闆朵欢鍚嶇О锛�"+partsInfo.getPartsName()+"鐢熸垚榛樿宸ュ簭锛屽伐搴忓彿锛�"+processStream.getProcessCode());
-// iNcLogInfoService.saveLogNcInfos(ncLogInfogx);
return permissionStreamService.save(stream);
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
index bde7afb..f266d1a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -100,24 +100,14 @@
ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
}
}
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("宸ュ簭鍚嶇О锛�"+stream.getProcessName()+"锛屽伐搴忓彿锛�"+stream.getProcessCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.save(stream);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
-// ProcessInfo processInfo = new ProcessInfo();
-// processInfo.setProcessName(stream.getProcessName());
-// processInfo.setDescription(stream.getDescription());
-// boolean processInfoB= processInfoService.addOrEdit(processInfo);
-// if(!processInfoB)
-// ExceptionCast.cast(CommonCode.FAIL);
+ //娣诲姞鐢ㄦ埛鏉冮檺
+ ProcessionPermission permission = new ProcessionPermission();
+ permission.setProcessId(stream.getProcessId());
+ permission.setUserId(userId);
+ processStreamPermissionService.save(permission);
//娣诲姞鏉冮檺楠岃瘉
PermissionStream permissionStream = new PermissionStream();
permissionStream.setUserId(userId);
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
index dbd3865..66e2f1a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -109,6 +109,11 @@
boolean b =super.save(workStep);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
+ //娣诲姞鐢ㄦ埛鏉冮檺
+ WorkStepPermission workStepPermission = new WorkStepPermission();
+ workStepPermission.setUserId(userId);
+ workStepPermission.setStepId(workStep.getId());
+ workStepPermissionService.save(workStepPermission);
//娣诲姞鏉冮檺楠岃瘉
PermissionStream permissionStream = new PermissionStream();
permissionStream.setUserId(userId);
--
Gitblit v1.9.3