修改车辆过滤

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java

@@ -1435,7 +1435,7 @@ public class CarController extends AbstractBaseController {
 		if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
 			orgCode=reginParams.getCompany().getOrgCode();
 		}
-		return iCarService.getCarCategoryInfo();
+		return iCarService.getCarCategoryInfo(orgCode);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -1449,7 +1449,7 @@ public class CarController extends AbstractBaseController {
 		if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
 			orgCode=reginParams.getCompany().getOrgCode();
 		}
-		return iCarService.getCarEquipStateInfo(keyWord);
+		return iCarService.getCarEquipStateInfo(keyWord,orgCode);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -1464,7 +1464,7 @@ public class CarController extends AbstractBaseController {
 		if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
 			orgCode=reginParams.getCompany().getOrgCode();
 		}
-		return iCarService.getCarEquipAlarmInfoDto(keyWord);
+		return iCarService.getCarEquipAlarmInfoDto(keyWord,orgCode);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -1493,7 +1493,7 @@ public class CarController extends AbstractBaseController {
 		if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
 			orgCode=reginParams.getCompany().getOrgCode();
 		}
-		return iCarService.getCarMileageInfoByMoth(date, current, size, keyWord);
+		return iCarService.getCarMileageInfoByMoth(date, current, size, keyWord,orgCode);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -1508,7 +1508,7 @@ public class CarController extends AbstractBaseController {
 		if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
 			orgCode=reginParams.getCompany().getOrgCode();
 		}
-		List<CarExportDto> list = this.iCarService.exportCarMileageInfoByMoth(date, keyWord);
+		List<CarExportDto> list = this.iCarService.exportCarMileageInfoByMoth(date, keyWord,orgCode);
 		if (org.springframework.util.StringUtils.isEmpty(date)) {
 			date = DateUtil.format(new Date(), "yyyy-MM");
 		}
@@ -1535,7 +1535,7 @@ public class CarController extends AbstractBaseController {
 		if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
 			orgCode=reginParams.getCompany().getOrgCode();
 		}
-		return iCarService.getCarExcepitonTrack(type, keyWord);
+		return iCarService.getCarExcepitonTrack(type, keyWord,orgCode);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -1550,7 +1550,7 @@ public class CarController extends AbstractBaseController {
 		if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
 			orgCode=reginParams.getCompany().getOrgCode();
 		}
-		return iCarService.getCarWarningRecord(keyWord, current, size);
+		return iCarService.getCarWarningRecord(keyWord, current, size,orgCode);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -1564,6 +1564,6 @@ public class CarController extends AbstractBaseController {
 		if (reginParams!=null&&reginParams.getCompany()!=null&&!ObjectUtils.isEmpty(reginParams.getCompany().getOrgCode())) {
 			orgCode=reginParams.getCompany().getOrgCode();
 		}
-		return iCarService.getBizOrgName();
+		return iCarService.getBizOrgName(orgCode);
 	}
 }