123

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

@@ -1662,6 +1662,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     }
 
     public ObjectRestResponse selectList(VehicleFindDTO vehicleFindDTO){
+        Integer type=vehicleFindDTO.getType() == null ? 0 :vehicleFindDTO.getType();
+        if (type > 0){
+            List<Integer> dataCompanyIds=vehicleFindDTO.getDataCompanyIds() == null ? new ArrayList<>() : vehicleFindDTO.getDataCompanyIds();
+            if (vehicleFindDTO.getBranchId() != null && vehicleFindDTO.getBranchId() > 0){
+                dataCompanyIds.add(vehicleFindDTO.getBranchId());
+                vehicleFindDTO.setDataCompanyIds(dataCompanyIds);
+            }
+        }
         PageHelper.startPage(vehicleFindDTO.getPage(), vehicleFindDTO.getLimit());
         PageInfo<VehicleVO> pageInfo = new PageInfo<>(getList(vehicleFindDTO));
         return ObjectRestResponse.succ(PageDataVO.pageInfo(pageInfo));

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/AdminVehicleController.java

@@ -54,14 +54,6 @@ public class AdminVehicleController extends BaseController<VehicleBiz>{
     @ApiModelProperty("店铺商品列表")
     public  ObjectRestResponse shopSelectList(VehicleFindDTO vehicleFindDTO) {
         setPowerData(vehicleFindDTO);
-        Integer type=vehicleFindDTO.getType() == null ? 0 :vehicleFindDTO.getType();
-        if (type > 0){
-            List<Integer> dataCompanyIds=vehicleFindDTO.getDataCompanyIds() == null ? new ArrayList<>() : vehicleFindDTO.getDataCompanyIds();
-            if (vehicleFindDTO.getBranchId() != null && vehicleFindDTO.getBranchId() > 0){
-                dataCompanyIds.add(vehicleFindDTO.getBranchId());
-                vehicleFindDTO.setDataCompanyIds(dataCompanyIds);
-            }
-        }
         return  baseBiz.selectList(vehicleFindDTO);
     }