bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2026-01-12 11:21:05 +08:00
parent 273e0af612 4312800e64
commit d802b903af
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java
View File

@ -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<RetainedEquipmentInfo> pageList = complexQueryService.getPersonNum(bean);
return AjaxResult.success(getDataTable(pageList));
}

6
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
View File

@ -1692,6 +1692,9 @@
sai.`status` = '0' and sai.`is_slt` = '0'
AND sai.end_time IS NULL
AND sai.back_id IS NULL
<if test="companyId != null">
AND sai.company_id = #{companyId}
</if>
GROUP BY mt.type_id
) AS subquery1
ON mt.type_id = subquery1.type_id
@ -1720,6 +1723,9 @@
<if test="typeModelName != null and typeModelName != ''">
and mt.type_name like concat('%',#{typeModelName},'%')
</if>
<if test="companyId != null">
and mt.company_id = #{companyId}
</if>
</select>
<select id="batchSelectInfo" resultType="com.bonus.material.basic.domain.UseStorageInfo">
SELECT