From 5337d6006b45ca61881623ad2e8738e03ad3bde2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 六月 2025 11:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 4055cf6..7db3355 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1455,7 +1455,8 @@
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
- .in(ApplyDetail::getMemberId,memberList.stream().map(i->i.getId()).collect(Collectors.toList()))
+ .in(CollectionUtils.isNotEmpty(memberList),ApplyDetail::getMemberId,memberList.stream().map(i->i.getId()).collect(Collectors.toList()))
+ .apply(CollectionUtils.isEmpty(memberList),"1 = 2 ")
.eq(ApplyDetail::getIsdeleted,Constants.ZERO));
List<ApplyChagneDetail> applyChangeDetailAllList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
@@ -1464,7 +1465,8 @@
.leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
.leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId)
.eq(ApplyChange::getApplyId,applyChange.getApplyId())
- .in(Member::getIdcardNo,memberList.stream().map(i->i.getId()).collect(Collectors.toList()))
+ .in(CollectionUtils.isNotEmpty(memberList),Member::getIdcardNo,memberList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList()))
+ .apply(CollectionUtils.isEmpty(memberList),"1 = 2 ")
.in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE));
List<ApplyChagneDetail> applyChagneDetailList = new ArrayList<>();
@@ -1516,7 +1518,7 @@
// memberMapper.updateById(member);
updMemberList.add(member);
applyChagneDetail.setMemberId(member.getId());
- if(applyChangeDetailAllList.stream().filter(
+ if(CollectionUtils.isNotEmpty(applyChangeDetailAllList)&&applyChangeDetailAllList.stream().filter(
j->Constants.equalsInteger(j.getMemberId(),applyChagneDetail.getMemberId())
).collect(Collectors.toList()).size()>Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
--
Gitblit v1.9.3