Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

@@ -10,6 +10,7 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
@@ -20,6 +21,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -100,7 +102,8 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
      * @return
      */
     public List<GoodDataVO> goodList(Integer page, Integer limit) {
-        List<GoodDataVO> goodDataVOS = Arrays.asList();
+        List<GoodDataVO> goodDataVOS = new ArrayList<>();
+
         /*设置分页*/
         Page<VehicleModel> pages = PageHelper.startPage(page, limit);
 
@@ -110,20 +113,26 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
                                 .andEqualTo(VehicleModel::getIsdel, 0)
                                 .andEqualTo(VehicleModel::getHotSign,1)
                 ).orderByDesc("id").build();
-        selectByExample(example);
+        List<VehicleModel> vehicleModels = selectByExample(example);
+        if (CollectionUtils.isEmpty(vehicleModels)) {
+            return null;
+        }
 
-        PageInfo<VehicleModel> pageInfo= PageInfo.of(pages.getResult());
+        PageInfo<VehicleModel> pageInfo= PageInfo.of(vehicleModels);
         List<VehicleModel> vehicleModelList = pageInfo.getList();
         /*遍历车型列表设置List<GoodDataVO>*/
-        for (VehicleModel vm : vehicleModelList) {
+        vehicleModelList.forEach(vm ->{
             GoodDataVO goodDataVO = new GoodDataVO();
             goodDataVO.setId(vm.getId());
             goodDataVO.setImgUrl(vm.getPicture());
             goodDataVO.setName(vm.getName());
             goodDataVO.setName1(vm.getKeyword());
             goodDataVO.setPrice(String.valueOf(vm.getBuyPrice()));
-            goodDataVOS.add(goodDataVO);
-        }
+            System.out.println("++++++++++++++++++++++++++++++++++++++"+goodDataVO+"++++++++++++++++++++++++++++++++++++++");
+            goodDataVOS.add(goodDataVO);});
+//        for (VehicleModel vm : vehicleModelList) {
+//
+//        }
         return goodDataVOS;
     }
 }
\ No newline at end of file