Browse Source

品牌修改:分页添加客户端名称集合

bmmx 1 year ago
parent
commit
8268f8e64f

+ 3 - 0
src/main/java/com/om/entity/vo/BrandVO.java

@@ -27,6 +27,9 @@ public class BrandVO {
     @ApiModelProperty(value = "客户端id集合")
     private List<Integer> clientIds;
 
+    @ApiModelProperty(value = "客户端名称集合")
+    private List<String> clientNames;
+
     @ApiModelProperty(value = "客户端路径")
     private String clientPath;
 

+ 2 - 0
src/main/java/com/om/service/impl/BrandServiceImpl.java

@@ -246,6 +246,8 @@ public class BrandServiceImpl extends ServiceImpl<BrandMapper, Brand> implements
             if (!CollectionUtil.isEmpty(clients)){
                 List<Integer> collect = clients.stream().map(c -> c.getClientId()).collect(Collectors.toList());
                 brandVO.setClientIds(collect);
+                List<String> stringList = clientService.listByIds(collect).stream().map(c -> c.getName()).collect(Collectors.toList());
+                brandVO.setClientNames(stringList);
 
             }
             list.add(brandVO);

+ 0 - 9
src/main/java/com/om/service/impl/DiagnosisVersionInfoServiceImpl.java

@@ -362,20 +362,11 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
                     .gt(DiagnosisVersionInfo::getVersion, version)
                     .orderByDesc(DiagnosisVersionInfo::getVersion)
                     .list();
-            if (diagnosisVersionInfos.isEmpty()){
-                return Result.fail("未获取到数据").result(ResultCode.NO_DATA);
-            }
             DiagnosisVersionInfo diagnosisVersionInfo = diagnosisVersionInfos.get(0);
-            if (BeanUtil.isEmpty(diagnosisVersionInfo)) {
-                return Result.fail("未获取到数据").result(ResultCode.NO_DATA);
-            }
             //根据品牌id查询品牌
             Brand brand = brandService.lambdaQuery()
                     .eq(Brand::getBrandCode,diagnosisVersionInfo.getBrandCode())
                     .one();
-            if (BeanUtil.isEmpty(brand)) {
-                throw new BadReqException("品牌不存在");
-            }
             VehicleDates vehicleDates1 = BeanUtil.copyProperties(diagnosisVersionInfo, VehicleDates.class);
 
             //根据语言获取对应描述