This commit is contained in:
parent
d17284eef8
commit
debcdb7238
|
|
@ -383,9 +383,9 @@ public class ComplexQueryController extends BaseController {
|
||||||
@GetMapping("/getMachineHistoryRecordList")
|
@GetMapping("/getMachineHistoryRecordList")
|
||||||
public AjaxResult getMachineHistoryRecordList(MachineHistoryRecordBean bean) {
|
public AjaxResult getMachineHistoryRecordList(MachineHistoryRecordBean bean) {
|
||||||
bean.setUserId(SecurityUtils.getLoginUser().getUserid());
|
bean.setUserId(SecurityUtils.getLoginUser().getUserid());
|
||||||
startPage();
|
|
||||||
Long deptId = typeService.getUserDeptId();
|
Long deptId = typeService.getUserDeptId();
|
||||||
bean.setCompanyId(deptId);
|
bean.setCompanyId(deptId);
|
||||||
|
startPage();
|
||||||
List<MachineHistoryRecordBean> list = complexQueryService.getMachineHistoryRecordList(bean);
|
List<MachineHistoryRecordBean> list = complexQueryService.getMachineHistoryRecordList(bean);
|
||||||
return AjaxResult.success(getDataTable(list));
|
return AjaxResult.success(getDataTable(list));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue