From 3d59c98962fd8ca3e6164e90264d3bc70f1bc297 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 20 Sep 2024 14:42:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../glxp/api/controller/collect/IoCollectOrderController.java | 2 ++
.../resources/mybatis/mapper/collect/IoCollectOrderMapper.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index a03829bd5..b2e66c454 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -93,7 +93,9 @@ public class IoCollectOrderController extends BaseController {
}
if (collectOrderRequest.getTagStatus() != null && collectOrderRequest.getTagStatus() == -2 ){
+ collectOrderRequest.setExcludeWorkCode(String.valueOf(collectOrderRequest.getWorkPlaceCode()));
collectOrderRequest.setWorkPlaceCode(null);
+ collectOrderRequest.setTagStatus(1);
}
if (CollUtil.isNotEmpty(sysWorkplaceDocumentResponses)) {
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 85660fd5e..1226ef5b4 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -65,7 +65,7 @@
- AND ico.workPlaceCode!=null and ico.workPlaceCode not in (#{excludeWorkCode})
+ AND ico.workPlaceCode is not null and ico.workPlaceCode not in (#{excludeWorkCode})