From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 19 九月 2023 09:28:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java index 775c622..c3c5def 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java @@ -156,7 +156,6 @@ */ private void initPushDataTaks(int type){ initSysadmin(); - List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list( Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true") .eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫� @@ -322,7 +321,6 @@ * 鍙戦�佺紪鐮佷富鏁版嵁 */ private void sendpushDataForService (List<DockingTask> dockingTaskS){ - //姣忎釜task渚濇鎵ц鎺ㄩ�� for (DockingTask dockingTask:dockingTaskS){ //姣忎釜task涓�涓簨鍔★紝寮�鍚� @@ -369,6 +367,13 @@ } if(isGroupCodeFlage){ code=data.getOrDefault("groupcode",""); + if(StringUtils.isBlank(code)) {//濡傛灉鏄泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈� + dockingTask.setDescription("绛夊緟闆嗗洟鐢宠闆嗗洟鐮�"); + dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE); + dockingTask.setLastModifyTime(new Date()); + dockingTaskService.updateById(dockingTask); + continue; + } } String[] classCodeLeves = dockingTask.getClassifyId().split(","); NodeJosnDTO nodeJosnDTO = new NodeJosnDTO(); -- Gitblit v1.9.3