From 9dd5d877978595c27b044b795ea31bc0347438c9 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 09 四月 2024 19:06:53 +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/NoticesServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
index d6651fd..a9ac725 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NoticesServiceImpl.java
@@ -145,6 +145,12 @@
queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.TAXES.getKey() });
} else if(pageWrap.getModel().getQueryType().equals(Constants.TWO)){
queryWrapper.in(Notices::getObjType,new Integer[]{Constants.NoticeObjectType.SETTLE_CLAIMS.getKey() });
+ }else if(pageWrap.getModel().getQueryType().equals(Constants.THREE)){
+ //濮旀墭淇濅唬鍔�
+ queryWrapper.notIn(Notices::getType,new Integer[]{Constants.NoticeType.SEVEN.getStatus() });
+ }else if(pageWrap.getModel().getQueryType().equals(Constants.FOUR)){
+ //濮旀墭淇濅唬鍔�
+ queryWrapper.in(Notices::getType,new Integer[]{Constants.NoticeType.SEVEN.getStatus() });
}
}
if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){
--
Gitblit v1.9.3