From abd832383e0a6941352215a1b150a6fb0c50e7dc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 24 十一月 2023 10:18:33 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 ae522ff..56b35b8 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
@@ -60,7 +60,7 @@
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
@Value("${dataSyncPush.dataParamName:xmlData}")
public String DATA_PARAM_NAME;
- @Value("${dataSyncPush.dataId:itemOid}")
+ @Value("${dataSyncPush.dataId:itemid}")
private String itemId;
@Resource
private MdmEngineService mdmEngineServiceI;
@@ -520,7 +520,7 @@
log.error("璋冪敤鎺ュ彛澶辫触:"+e);
// throw new Throwable("璋冪敤鎺ュ彛澶辫触:"+e);
ResultNodeObjectDTO resultNodeObjectDTO=new ResultNodeObjectDTO();
- resultNodeObjectDTO.setErroid("0");
+ resultNodeObjectDTO.setErroid("1");
resultNodeObjectDTO.setMsg(msg);
resultNodeObjectDTO.setCode(dockingSystemConfig.getPushType().equalsIgnoreCase("2")?dockingTask.getClassifyId():dockingTask.getId());
resultNodeObjectDTO.setItemid(dockingTask.getBtmOid());
@@ -530,9 +530,9 @@
for (ResultNodeObjectDTO resultNodeObjectDTO:resultNodeObjectDTOS){
String erroid = resultNodeObjectDTO.getErroid();
msg = resultNodeObjectDTO.getMsg();
- if("1".equals(erroid)){
+ if("0".equals(erroid)){
isSend = true;
- }else if("0".equals(erroid)){
+ }else if("1".equals(erroid)){
isSend=false;
}else{
isSend=false;
--
Gitblit v1.9.3