diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java index 21a624d..ad43e9a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java @@ -227,6 +227,7 @@ public class PublicController extends BaseController { @GetMapping("/yqList") public TableDataInfo yqList(YqSearchForm form) { + form.setFridge(NormalEnum.no.getValue()); startPage(); List list = yqService.queryList(form); return getDataTable(list); @@ -292,13 +293,12 @@ public class PublicController extends BaseController { * @return */ @GetMapping("/fridgeList") - public TableDataInfo getFridgeList(YqSearchForm form) { + public AjaxResult getFridgeList(YqSearchForm form) { List superiorAndSubordinate = sysDeptService.getSuperiorAndSubordinate(SecurityUtils.getLoginUser().getSysUser().getDeptId()); List deptIdList = superiorAndSubordinate.stream().map(SysDept::getDeptId).collect(Collectors.toList()); form.setDeptIdList(deptIdList); - startPage(); form.setFridge(NormalEnum.yes.getValue()); List list = yqService.queryList(form); - return getDataTable(list); + return success(list); } }