Browse Source

fix: some bug

zhangwei 2 years ago
parent
commit
54c696893f

+ 3 - 2
src/main/java/com/winhc/repal/service/impl/RepalCustomerServiceImpl.java

@@ -132,7 +132,7 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
          Map<Long, RepalGroupMember> memberMap = new HashMap<>();
          Map<Long, RepalGroupMember> memberMap = new HashMap<>();
          if(CollUtil.isNotEmpty(rels)) {
          if(CollUtil.isNotEmpty(rels)) {
              memberMap = repalGroupMemberService.list(Wrappers.lambdaQuery(RepalGroupMember.class)
              memberMap = repalGroupMemberService.list(Wrappers.lambdaQuery(RepalGroupMember.class)
-                             .in(RepalGroupMember::getUserId, rels.stream().map(RepalCustChargeRel::getMemberUserId).collect(Collectors.toList())))
+                             .in(RepalGroupMember::getUserId, rels.stream().map(RepalCustChargeRel::getMemberUserId).collect(Collectors.toList())).eq(RepalGroupMember::getDeleted,Dict.DeletedStatusEnunm.否.getCode()))
                      .stream().collect(Collectors.toMap(RepalGroupMember::getUserId, Function.identity(),(a,b)->a));
                      .stream().collect(Collectors.toMap(RepalGroupMember::getUserId, Function.identity(),(a,b)->a));
          }
          }
          List<RepalCustomerInfoVO> voList = new ArrayList<>();
          List<RepalCustomerInfoVO> voList = new ArrayList<>();
@@ -417,7 +417,8 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
                 .eq(RepalCustChargeRel::getCustId,custId));
                 .eq(RepalCustChargeRel::getCustId,custId));
         if(CollUtil.isNotEmpty(rels)){
         if(CollUtil.isNotEmpty(rels)){
             List<RepalGroupMember> repalGroupMembers = repalGroupMemberService.list(Wrappers.lambdaQuery(RepalGroupMember.class)
             List<RepalGroupMember> repalGroupMembers = repalGroupMemberService.list(Wrappers.lambdaQuery(RepalGroupMember.class)
-                    .in(RepalGroupMember::getUserId,rels.stream().map(RepalCustChargeRel::getMemberUserId).collect(Collectors.toList())));
+                    .in(RepalGroupMember::getUserId,rels.stream().map(RepalCustChargeRel::getMemberUserId).collect(Collectors.toList()))
+                    .eq(RepalGroupMember::getDeleted,Dict.DeletedStatusEnunm.否.getCode()));
             List<RepalGroupMemberVO> memberList = new ArrayList<>();
             List<RepalGroupMemberVO> memberList = new ArrayList<>();
             result.setCharges(memberList);
             result.setCharges(memberList);
             for(RepalGroupMember groupMember:repalGroupMembers){
             for(RepalGroupMember groupMember:repalGroupMembers){