Commit b195e904 authored by zhangsen's avatar zhangsen

修改首页bug

parent cc1de97e
...@@ -105,7 +105,7 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT ...@@ -105,7 +105,7 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
QueryWrapper<PowerTransferCompanyResources> powerTransferCompanyResourcesQueryWrapper = new QueryWrapper<>(); QueryWrapper<PowerTransferCompanyResources> powerTransferCompanyResourcesQueryWrapper = new QueryWrapper<>();
powerTransferCompanyResourcesQueryWrapper.eq("resources_id", resourceId); powerTransferCompanyResourcesQueryWrapper.eq("resources_id", resourceId);
powerTransferCompanyResourcesQueryWrapper.eq("status", status); powerTransferCompanyResourcesQueryWrapper.eq("status", status);
powerTransferCompanyResourcesQueryWrapper.eq("is_deleted", 0); powerTransferCompanyResourcesQueryWrapper.eq("is_delete", 0);
return powerTransferCompanyResourcesMapper.selectCount(powerTransferCompanyResourcesQueryWrapper); return powerTransferCompanyResourcesMapper.selectCount(powerTransferCompanyResourcesQueryWrapper);
} }
} }
...@@ -81,7 +81,7 @@ public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCa ...@@ -81,7 +81,7 @@ public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCa
if (userCar == null) { if (userCar == null) {
return 0; return 0;
} }
return companyResourcesService.getCarExecutingCountById(userCar.getRecUserId(), "executing"); return companyResourcesService.getCarExecutingCountById(userCar.getCarId().toString(), "executing");
//bug 6065 首页报错,接口selectOne 一个资源对应多条数据。 //bug 6065 首页报错,接口selectOne 一个资源对应多条数据。
// PowerTransferCompanyResources resource = companyResourcesService.getResourceById(userCar.getCarId().toString()); // PowerTransferCompanyResources resource = companyResourcesService.getResourceById(userCar.getCarId().toString());
// if (resource == null) { // if (resource == null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment