From db5ed49b5473b63bf08c4e0c7ffa752ed35a3a95 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 18:46:02 +0800
Subject: [PATCH] 关于接口配置管理模块更改/统一接口涉及集团码申请功能需求bug修复

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 3ec3629..e3a1fe8 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
@@ -213,7 +213,8 @@
 					String operation="";
 					if(CODE_CHECKCONFIG) {
 						//鏍¢獙鏄惁閰嶇疆
-						DockingSystemConfig dockingSystemConfig= checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
+						DockingSystemConfig dockingSystemConfig=null;
+						dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
 						if(dockingSystemConfig==null){
 							errorid[0] ="101";
 							throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
@@ -1677,7 +1678,6 @@
 	 */
 	private DockingSystemConfig  checkIspass(String systemId,String type,String operationType,String classOid){
 		log.info("systemId锛�"+systemId+",type:"+SysIntegrationDataFlowTypeEnum.getTextByValue(type)+",operationType:"+sysIntegrationPushTypeEnum.getTextByValue(operationType)+",classOid:"+classOid);
-		DockingSystemConfig dockingSystemConfig=null;
 		CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
 		classOid=codeClassifyVO.getOid();
 		//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
@@ -1687,16 +1687,16 @@
 		queryWrapper.eq(DockingSystemConfig::getDataFlowType,type);
 		queryWrapper.eq(DockingSystemConfig::getPushType,operationType);
 		if(StringUtils.isNotBlank(classOid)){
-			queryWrapper.in(DockingSystemConfig::getClassifyId,classOid);
+			queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
 		}
 		List<DockingSystemConfig> dockingSystemConfigList=	dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
 		if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
-			dockingSystemConfig=dockingSystemConfigList.get(0);
+		 return	dockingSystemConfigList.get(0);
 		}else{
 			if(StringUtils.isNotBlank(codeClassifyVO.getParentCodeClassifyOid())) {
-				checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid());
+				return checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid());
 			}
 		}
-		return dockingSystemConfig;
+		return dockingSystemConfigList.get(0);
 	}
 }

--
Gitblit v1.9.3