From 4650b85dae80d7f1750a37675586b1fc4c7adc99 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 九月 2025 15:42:51 +0800
Subject: [PATCH] 审批用户列表改为树形
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 26 ++++++++++++--------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java | 6 +++++-
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java
index 01c30cd..7da3d7f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmUserService.java
@@ -97,7 +97,11 @@
ProgramNodeVO userNode = new ProgramNodeVO();
userNode.setId(String.valueOf(u.getId()));
userNode.setName(u.getName());
- userNode.setNodeType("user");
+ if(u.isManager()){
+ userNode.setNodeType("manager");
+ }else {
+ userNode.setNodeType("user");
+ }
deptNode.getChildren().add(userNode);
}
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index 54f57eb..7ff4b64 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -143,7 +143,7 @@
}
progData.setProgramName(packageName);
- String statusLine = "";
+ String statusLine;
Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(entryName)).findFirst();
if(optFilename.isPresent()){
entry = zipFile.getEntry(optFilename.get());
@@ -162,18 +162,17 @@
}else{
//鏌ヨ鏄惁杞﹀簥锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊
programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
- Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
-
- String chechuangVal = paramService.turninngValue();
- if(StringUtils.equals(machine.getMachineSpec(),chechuangVal)){
- //杞﹀簥
- ProgramAnnotation pa = programAnnotationService.getProgramAnnotationFormat(machine.getMachineGroupCode(),annotionDictList);
- statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);
- }else {
- //闈炶溅搴婃棤鐘舵�侊紝鐩存帴鎶ラ敊
- throw new ServiceException("鏈壘鍒扮▼搴忔枃浠朵腑鐨勭姸鎬佹敞閲�");
+ if(programPackageNode!=null){
+ Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
+ String chechuangVal = paramService.turninngValue();
+ if(StringUtils.equals(machine.getMachineSpec(),chechuangVal)){
+ //杞﹀簥
+ ProgramAnnotation pa = programAnnotationService.getProgramAnnotationFormat(machine.getMachineGroupCode(),annotionDictList);
+ statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);
+ }
}
}
+
if(programPackageNode != null) {
progData.setId(programPackageNode.getId());
progData.setProgramNo(programPackageNode.getProgramNo());
@@ -190,10 +189,10 @@
progData.setFiles(programFiles);
list.add(progData);
}else{
- throw new ServiceException("鎵句笉鍒扮▼搴忓寘鍚�:"+packageName+statusLine);
+ throw new ServiceException("鎵句笉鍒扮▼搴忓寘鍚�:"+packageName);
}
}else{
- throw new ServiceException(entryName+"鍖呬笅鏈壘鍒版枃浠�"+statusLine);
+ throw new ServiceException(entryName+"鍖呬笅鏈壘鍒版枃浠�");
}
}
@@ -269,7 +268,6 @@
//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
for(String dir : dirList){
- //String programPackageName1 = StringUtils.removeEnd(dir,"/");
String folderName = StringUtils.removeEnd(dir,"/");
PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
--
Gitblit v1.9.3