Merge remote-tracking branch 'origin/master'

2026-01-22 15:24:08 +08:00 · 2026-01-22 15:24:08 +08:00 · d83f760625
parent f02df31083 debcdb7238
commit d83f760625
1 changed files with 1 additions and 1 deletions
--- 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
@ -383,9 +383,9 @@ public class ComplexQueryController extends BaseController {
    @GetMapping("/getMachineHistoryRecordList")
    public AjaxResult getMachineHistoryRecordList(MachineHistoryRecordBean bean) {
        bean.setUserId(SecurityUtils.getLoginUser().getUserid());
-        startPage();
        Long deptId = typeService.getUserDeptId();
        bean.setCompanyId(deptId);
+        startPage();
        List<MachineHistoryRecordBean> list = complexQueryService.getMachineHistoryRecordList(bean);
        return AjaxResult.success(getDataTable(list));
    }