From 2d528d024b179b6b06d1d2702e72f6caa5f67149 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 09:45:30 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 a9ac725..108a8c3 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
@@ -7,10 +7,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.NoticesMapper;
import com.doumee.dao.business.join.NoticesJoinMapper;
-import com.doumee.dao.business.model.ApplyChagneDetail;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.InsuranceApply;
-import com.doumee.dao.business.model.Notices;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApplyNoticeVO;
import com.doumee.service.business.NoticesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -114,6 +111,8 @@
queryWrapper.selectAll(Notices.class);
queryWrapper.selectAs(Company::getName,Notices::getCompanyName);
queryWrapper.leftJoin(Company.class,Company::getId,Notices::getCompanyId);
+ queryWrapper.ne(Notices::getType, Constants.NoticeType.SIX.getStatus());
+ queryWrapper.eq(Notices::getIsdeleted,Constants.ZERO);
if (pageWrap.getModel().getIsdeleted() != null) {
queryWrapper.eq(Notices::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
@@ -198,6 +197,7 @@
.eq(Notices::getCompanyId,companyId)
.eq(Notices::getObjType,Constants.NoticeObjectType.INSURANCE_APPLY.getKey())
.eq(Notices::getStatus,Constants.ZERO)
+ .eq(Notices::getIsdeleted,Constants.ZERO)
.in(Notices::getType,Constants.NoticeType.SIX.getStatus(),Constants.NoticeType.ONE.getStatus())
);
if(CollectionUtils.isNotEmpty(noticesList)){
--
Gitblit v1.9.3