diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/service/impl/StopAffairServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/service/impl/StopAffairServiceImpl.java index 1d450923..102aa414 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/service/impl/StopAffairServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/ht/service/impl/StopAffairServiceImpl.java @@ -68,9 +68,8 @@ public class StopAffairServiceImpl extends BaseService } for (int i = 0; i < list.size(); i++) { String token = getTokens("ZZZH"); - //String senddata = getStopAffair(list.get(i).getWorkitemId(),list.get(i).getLoginName()); - String senddata = getStopAffair(list.get(i).getWorkitemId(),"ZZZH"); - String returnData = doSendData("8000590007",token,senddata); + String senddata = getStopAffair(list.get(i).getCtpAffairId(),"ZZZH"); + String returnData = doSendData("8000590002",token,senddata); logger.error("终止流程返回结果"+returnData); if (StrUtil.isNotEmpty(returnData)){ logger.error("终止流程返回结果"+returnData); diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index 822bd239..71510119 100644 --- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -979,6 +979,12 @@ where id = #{id} not like #{item.filedVaule} + + is null + + + not null +