diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java index c060f360..7c52d81e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java @@ -542,6 +542,8 @@ public class ComplexQueryController extends BaseController { @ApiOperation(value = "施工机具需求、供应分析统计表") @GetMapping("/getStatisticsList") public AjaxResult getStatisticsList(ProjUsingRecord bean) { + Long companyId = typeService.getUserDeptId(); + bean.setCompanyId(companyId.intValue()); startPage(); List pageList = complexQueryService.getStatisticsList(bean); return AjaxResult.success(getDataTable(pageList)); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index 524a5bb2..8f2faaea 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -656,11 +656,6 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { @Override public List getStatisticsList(ProjUsingRecord bean) { try { - /** - * jsk - */ - Long companyId=iTypeService.getUserDeptId(); - bean.setCompanyId(companyId.intValue()); // 1、查询工程对应的物资名称、型号、需求数量、已供数量 List list = complexQueryMapper.getStatisticsList(bean);