From c607413527d3e6bfb4a691fb4ba302c960f1bac3 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 02 八月 2023 14:57:02 +0800 Subject: [PATCH] 提交代码 --- Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java | 4 ++-- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 2 +- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 4 ---- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java index 8c8a346..9e71a03 100644 --- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java +++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java @@ -47,13 +47,13 @@ * nacos prod 鍦板潃 */ //String NACOS_PROD_ADDR = "dev.vci-tech.com:38848"; - String NACOS_PROD_ADDR = "127.0.0.1:8848"; + String NACOS_PROD_ADDR = "192.168.243.130:8848"; /** * nacos test 鍦板潃 */ //String NACOS_TEST_ADDR = "dev.vci-tech.com:38848"; - String NACOS_TEST_ADDR = "127.0.0.1:8848"; + String NACOS_TEST_ADDR = "192.168.243.130:8848"; /** * sentinel dev 鍦板潃 diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java index b623e12..bb3b32b 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java @@ -145,9 +145,9 @@ } String tenantId = AuthUtil.getTenantId().toString(); Map<String, String> conditionMap = baseQueryObject.getConditionMap(); - if(Func.isNotEmpty(tenantId)){ + /*if(Func.isNotEmpty(tenantId)){ conditionMap.put("TENANT_ID",tenantId); - } + }*/ return CodeClstempattrService.gridCodeClassifyTemplateAttr(conditionMap,baseQueryObject.getPageHelper()); } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java index 25d7234..3aa955a 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java @@ -456,10 +456,6 @@ if(!CollectionUtils.isEmpty(oids)){ this.removeBatchByIds(oids); } - String tenantId = AuthUtil.getTenantId().toString(); - codeClassifyTemplateAttrDOInsert.parallelStream().forEach(item->{ - item.setTenantId(tenantId); - }); //鍐嶆柊澧� if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOInsert)){ this.saveBatch(codeClassifyTemplateAttrDOInsert); diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java index 0edd622..42a8545 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java @@ -2359,7 +2359,7 @@ // conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY) conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + - btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY)) + btmTypeClient.selectByIdCollection(Collections.singletonList("classify")) .getData().get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant .FRAMEWORK_DATA_ENABLED + "' start with parentCodeClassifyOid = '" + codeClassifyOid + "' CONNECT BY PRIOR OID = parentCodeClassifyOid )"); -- Gitblit v1.9.3