Преглед на файлове

2023年7月5日15:44:22

纪新园 преди 2 години
родител
ревизия
8af3d5baaf

+ 5 - 2
blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/BusinessOverpaymentController.java

@@ -19,6 +19,7 @@ package org.springblade.mocha.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -88,7 +89,9 @@ public class BusinessOverpaymentController extends BladeController {
 			//根据编码获取客户信息
 			List<CorpsDesc> list = corpsDescClient.getCodeCorp(businessOverpayment.getCorpCode());
 			List<Long> corpIds = list.stream().map(CorpsDesc::getId).collect(Collectors.toList());
-			lambdaQueryWrapper.in(BusinessOverpayment::getCorpId, corpIds);//编码
+			if (ObjectUtils.isNotNull(corpIds) && corpIds.size()>0){
+				lambdaQueryWrapper.in(BusinessOverpayment::getCorpId, corpIds);//编码
+			}
 		}
 
 		IPage<BusinessOverpayment> pages = businessOverpaymentService.page(Condition.getPage(query), lambdaQueryWrapper);
@@ -105,7 +108,7 @@ public class BusinessOverpaymentController extends BladeController {
 			pages.getRecords().stream().forEach(item ->{
 				if (item.getCorpId() != null) {
 					if (ObjectUtil.isNotEmpty(corpsDescList)) {
-						item.setCorpCode(corpsDescList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().get().getCode());
+						item.setCorpCode(corpsDescList.stream().filter(e -> e.getId().equals(item.getCorpId())).findFirst().orElse(new CorpsDesc()).getCode());
 					}
 				}
 				if (ObjectUtil.isNotEmpty(item.getCreateUser())){