Merge branch 'master-vehicle-price' into dev-tiande

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

 package com.xxfc.platform.vehicle.pojo;
 
+import com.github.wxiaoqi.security.common.vo.DataInter;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
-public class VehiclePageQueryVo {
+public class VehiclePageQueryVo implements DataInter {
 
     /**
      * 车辆编号，0-没有
@@ -153,4 +155,8 @@ public class VehiclePageQueryVo {
      */
     private boolean download;
 
+    List<Integer> dataCompanyIds;
+
+    List<Integer> dataCorporationIds;
+
 }

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

@@ -1132,6 +1132,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
      * @throws Exception
      */
     public PageDataVO<ResultVehicleVo> getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception {
+        setPowerData(vehiclePageQueryVo);
         Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
         Integer pageSize = (Integer) params.get("limit");
         params.remove("pageSize");

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

@@ -148,8 +148,8 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
             UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
             if (userDTO != null) {
                 if (userDTO.getDataAll() == 2) {
-                    List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                    return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, companyList));
+                    setPowerData(vehiclePageQueryVo);
+                    return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, vehiclePageQueryVo.getDataCompanyIds()));
                 }
             }
             return RestResponse.data(baseBiz.getByPage(vehiclePageQueryVo));
@@ -169,8 +169,8 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
             UserDTO userDTO = userFeign.userinfoByUid(uid).getData();
             if (userDTO != null) {
                 if (userDTO.getDataAll() == 2) {
-                    List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                    return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, companyList));
+                    setPowerData(vehiclePageQueryVo);
+                    return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, vehiclePageQueryVo.getDataCompanyIds()));
                 }
             }