zhangwei 3 лет назад
Родитель
Сommit
69a91ba458

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

@@ -133,7 +133,7 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
          if(CollUtil.isNotEmpty(rels)) {
              memberMap = repalGroupMemberService.list(Wrappers.lambdaQuery(RepalGroupMember.class)
                              .in(RepalGroupMember::getUserId, rels.stream().map(RepalCustChargeRel::getMemberUserId).collect(Collectors.toList())))
-                     .stream().collect(Collectors.toMap(RepalGroupMember::getUserId, Function.identity()));
+                     .stream().collect(Collectors.toMap(RepalGroupMember::getUserId, Function.identity(),(a,b)->a));
          }
          List<RepalCustomerInfoVO> voList = new ArrayList<>();
          for(RepalCustomerInfoBO customerInfo:page.getRecords()){

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

@@ -400,7 +400,7 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
                 return new VOPage<>();
             }
             qw.in(RepalRemindHistory::getRepalBillId,repalBills.stream().map(RepalBill::getId).collect(Collectors.toList()));
-            Map<String,RepalCustomer> repalCustomerMap = repalCustomerService.list(Wrappers.lambdaQuery(RepalCustomer.class).in(RepalCustomer::getCustId,repalBills.stream().map(RepalBill::getCustomerId).collect(Collectors.toList()))).stream().collect(Collectors.toMap(RepalCustomer::getCustName, Function.identity()));
+            Map<String,RepalCustomer> repalCustomerMap = repalCustomerService.list(Wrappers.lambdaQuery(RepalCustomer.class).in(RepalCustomer::getCustId,repalBills.stream().map(RepalBill::getCustomerId).collect(Collectors.toList()))).stream().collect(Collectors.toMap(RepalCustomer::getCustName, Function.identity(),(a,b)->a));
             IPage<RepalRemindHistory> pageAccountRemindHistory = page(new Page<>(pageNum, pageSize), qw);
             if(CollUtil.isNotEmpty(pageAccountRemindHistory.getRecords())){
                 result = new VOPage<>(pageNum, pageSize, pageAccountRemindHistory.getTotal(), pageAccountRemindHistory.getRecords().stream()
@@ -497,7 +497,7 @@ public class RepalRemindHistoryServiceImpl extends ServiceImpl<RepalRemindHistor
                 return new VOPage<>();
             }
             qw.in(RepalRemindHistory::getRepalBillId,repalBills.stream().map(RepalBill::getId).collect(Collectors.toList()));
-            Map<String,RepalCustomer> repalCustomerMap = repalCustomerService.list(Wrappers.lambdaQuery(RepalCustomer.class).in(RepalCustomer::getCustId,repalBills.stream().map(RepalBill::getCustomerId).collect(Collectors.toList()))).stream().collect(Collectors.toMap(RepalCustomer::getCustName, Function.identity()));
+            Map<String,RepalCustomer> repalCustomerMap = repalCustomerService.list(Wrappers.lambdaQuery(RepalCustomer.class).in(RepalCustomer::getCustId,repalBills.stream().map(RepalBill::getCustomerId).collect(Collectors.toList()))).stream().collect(Collectors.toMap(RepalCustomer::getCustName, Function.identity(),(a,b)->a));
             IPage<RepalRemindHistory> pageAccountRemindHistory = page(new Page<>(pageNum, pageSize), qw);
             if(CollUtil.isNotEmpty(pageAccountRemindHistory.getRecords())){
                 result = new VOPage<>(pageNum, pageSize, pageAccountRemindHistory.getTotal(), pageAccountRemindHistory.getRecords().stream()