From 241867ae64ccfe5bf61bd5e939af1f308ca1e3b3 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 07 四月 2024 15:25:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
index f2ec996..d54638f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java
@@ -193,7 +193,7 @@
@Override
public PageData<ApplyDetail> findPageForCompany(PageWrap<ApplyDetailPageDTO> pageWrap) {
IPage<ApplyDetail> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- if(pageWrap.getModel().getApplyId() == null){
+ if(pageWrap.getModel().getApplyId() == null && pageWrap.getModel().getUnionApplyId() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
--
Gitblit v1.9.3