From 6c92976e4e560575bf17646a74a45aa6c7eb1923 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 九月 2023 08:52:32 +0800
Subject: [PATCH] 代码打包重新部署
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 28b5aa4..e91e46a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1782,10 +1782,10 @@
}
log.info(libId);
}else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
- int level = codeBasicSecVO.getCodeLevelValue();
CodeClassifyVO levelCodeClassifyVO = new CodeClassifyVO();
CodeClassifyFullInfoBO classifyFullInfoBO = this.classifyService.getClassifyFullInfo(codeClassifyDO.getOid());
if(codeBasicSecVO.getCodeLevelType().equals("code_level_special")){//鎸囧畾灞傜骇
+ int level = codeBasicSecVO.getCodeLevelValue();
List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
if (classifyVOS.size() >= level && level > 0) {
levelCodeClassifyVO = classifyVOS.get(level - 1);
@@ -2235,7 +2235,8 @@
if(StringUtils.isNotBlank(classOid)){
queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
}
- List<DockingSystemConfig> dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
+ List<DockingSystemConfig> dockingSystemConfigList=new ArrayList<>();
+ dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
return dockingSystemConfigList.get(0);
}else{
@@ -2243,6 +2244,10 @@
return checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid());
}
}
- return dockingSystemConfigList.get(0);
+ if(dockingSystemConfigList.size()>0){
+ return dockingSystemConfigList.get(0);
+ }else{
+ return new DockingSystemConfig();
+ }
}
}
--
Gitblit v1.9.3