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})