审批用户列表改为树形

yangys

2025-09-04 4650b85dae80d7f1750a37675586b1fc4c7adc99

审批用户列表改为树形

 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);
                    }
                }

 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);