|
@@ -134,9 +134,11 @@ public class BrandController extends AbstractController{
|
|
BeanUtils.copyProperties(brandEntity,brandRspVo);
|
|
BeanUtils.copyProperties(brandEntity,brandRspVo);
|
|
List<SysUserBrand> brandBindUserIdList = mySysUserBrandService.getBrandBindUserIdList(brandEntity.getId());
|
|
List<SysUserBrand> brandBindUserIdList = mySysUserBrandService.getBrandBindUserIdList(brandEntity.getId());
|
|
List<Long> userIds = brandBindUserIdList.parallelStream().map(SysUserBrand::getUserId).collect(Collectors.toList());
|
|
List<Long> userIds = brandBindUserIdList.parallelStream().map(SysUserBrand::getUserId).collect(Collectors.toList());
|
|
- List<String> nameList = zhiHouseService.getBindUserNameList(userIds,token);
|
|
|
|
- if (!CollectionUtils.isEmpty(nameList)) {
|
|
|
|
- brandRspVo.setBindShowerNameList(nameList.stream().collect(Collectors.joining(";")));
|
|
|
|
|
|
+ if(userIds.size() >0){
|
|
|
|
+ List<String> nameList = zhiHouseService.getBindUserNameList(userIds,token);
|
|
|
|
+ if (!CollectionUtils.isEmpty(nameList)) {
|
|
|
|
+ brandRspVo.setBindShowerNameList(nameList.stream().collect(Collectors.joining(";")));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
JSONObject jsonObject = zhiHouseService.queryBySceneNum(brandEntity.getSceneNum(),token);
|
|
JSONObject jsonObject = zhiHouseService.queryBySceneNum(brandEntity.getSceneNum(),token);
|
|
if(!ObjectUtils.isEmpty(jsonObject)){
|
|
if(!ObjectUtils.isEmpty(jsonObject)){
|
|
@@ -145,6 +147,8 @@ public class BrandController extends AbstractController{
|
|
}
|
|
}
|
|
return brandRspVo;
|
|
return brandRspVo;
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
|
+
|
|
|
|
+
|
|
return Result.success(PageUtilsPlus.page(rspBrandList,resultPage));
|
|
return Result.success(PageUtilsPlus.page(rspBrandList,resultPage));
|
|
}
|
|
}
|
|
|
|
|