三方导入BUG修复

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandCategoryController.java

@@ -74,8 +74,8 @@ public class BasicdataBrandCategoryController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataBrandCategory")
-	public R<IPage<BasicdataBrandCategoryEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataBrandCategory, Query query) {
+	public R<List<BasicdataBrandCategoryEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataBrandCategory, Query query) {
-		IPage<BasicdataBrandCategoryEntity> pages = basicdataBrandCategoryService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataBrandCategory, BasicdataBrandCategoryEntity.class));
+		List<BasicdataBrandCategoryEntity> pages = basicdataBrandCategoryService.list(Condition.getPage(query), Condition.getQueryWrapper(basicdataBrandCategory, BasicdataBrandCategoryEntity.class));
 		return R.data(pages);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java

@@ -270,13 +270,13 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 			 string = data.stream().filter(a -> Objects.isNull(a.getBrandName())).map(BasicdataTripartiteMallExcel::getTripartiteMall).collect(Collectors.joining(","));
 			throw new ServiceException(string+"未填写品牌信息");
 		}
-		String clientNames = data.stream().map(BasicdataTripartiteMallExcel::getClientName).collect(Collectors.joining(","));
+		List<String> clientNames = data.stream().map(BasicdataTripartiteMallExcel::getClientName).distinct().collect(Collectors.toList());
 
 		//查询客户信息是否合法
 		List<BasicdataClientEntity> basicdataClientEntityList = basicdataClientService.list(Wrappers.<BasicdataClientEntity>query().lambda()
 			.in(BasicdataClientEntity::getClientName, clientNames)
 		);
-		if (!basicdataClientEntityList.isEmpty()) {
+		if (basicdataClientEntityList.isEmpty()) {
 			throw new ServiceException(clientNames+"查询客户信息错误");
 		}
 		Map<String, List<BasicdataClientEntity>> listMap = basicdataClientEntityList.stream().collect(Collectors.groupingBy(BasicdataClientEntity::getClientName));
@@ -291,9 +291,12 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 				clientIds.addAll(entities.stream().map(BasicdataTripartiteMallEntity::getClientId).collect(Collectors.toList()));
 			}else {
 				List<BasicdataClientEntity> basicdataClientEntities = listMap.get(datum.getClientName());
-				if (basicdataClientEntities.size() > 1) {
+				if (basicdataClientEntities.isEmpty()) {
 					throw new ServiceException(datum.getClientName()+"客户信息错误");
 				}
+				if (basicdataClientEntities.size() != 1) {
+					throw new ServiceException(datum.getClientName()+"客户信息存在多个");
+				}
 				BasicdataClientEntity basicdataClientEntity = basicdataClientEntities.get(0);
 				BasicdataTripartiteMallEntity basicdataTripartiteMall = BeanUtil.copyProperties(datum, BasicdataTripartiteMallEntity.class);
 				basicdataTripartiteMall.setClientId(basicdataClientEntity.getId());