git ch

k94314517

2025-06-12 7257c9bc44ca11551c121a18133f304f209db32e

 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() + "】存在申请中的加减保/换厂单据");