From a75e1404e9196491c564fb63ed72a704e06486b2 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 29 Aug 2025 13:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frame/plugin/ht/service/impl/StopAffairServiceImpl.java | 5 ++---
 .../com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

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<StopAffairEntity,String>
         }
         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}
                         <when test="item.compareType == '6'.toString() ">
                             not like #{item.filedVaule}
                         </when>
+                        <when test="item.compareType == '7'.toString() ">
+                            is null
+                        </when>
+                        <when test="item.compareType == '8'.toString() ">
+                            not null
+                        </when>
                     </choose>
 
                     <choose>