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 c6469649..46b7d405 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 @@ -501,6 +501,8 @@ public class ComplexQueryController extends BaseController { @GetMapping("/getPersonNum") public AjaxResult getPersonNum(RetainedEquipmentInfo bean) { startPage(); + Long deptId = typeService.getUserDeptId(); + bean.setCompanyId(Math.toIntExact(deptId)); List pageList = complexQueryService.getPersonNum(bean); return AjaxResult.success(getDataTable(pageList)); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 78a836c8..5b55a8c0 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -1692,6 +1692,9 @@ sai.`status` = '0' and sai.`is_slt` = '0' AND sai.end_time IS NULL AND sai.back_id IS NULL + + AND sai.company_id = #{companyId} + GROUP BY mt.type_id ) AS subquery1 ON mt.type_id = subquery1.type_id @@ -1720,6 +1723,9 @@ and mt.type_name like concat('%',#{typeModelName},'%') + + and mt.company_id = #{companyId} +