Browse Source

feat:[资源库管理][冰箱选择器]

master
HanLong 2 months ago
parent
commit
0e121dd71f
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java

+ 3
- 3
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java View File

@ -227,6 +227,7 @@ public class PublicController extends BaseController {
@GetMapping("/yqList") @GetMapping("/yqList")
public TableDataInfo yqList(YqSearchForm form) public TableDataInfo yqList(YqSearchForm form)
{ {
form.setFridge(NormalEnum.no.getValue());
startPage(); startPage();
List<Yq> list = yqService.queryList(form); List<Yq> list = yqService.queryList(form);
return getDataTable(list); return getDataTable(list);
@ -292,13 +293,12 @@ public class PublicController extends BaseController {
* @return * @return
*/ */
@GetMapping("/fridgeList") @GetMapping("/fridgeList")
public TableDataInfo getFridgeList(YqSearchForm form) {
public AjaxResult getFridgeList(YqSearchForm form) {
List<SysDept> superiorAndSubordinate = sysDeptService.getSuperiorAndSubordinate(SecurityUtils.getLoginUser().getSysUser().getDeptId()); List<SysDept> superiorAndSubordinate = sysDeptService.getSuperiorAndSubordinate(SecurityUtils.getLoginUser().getSysUser().getDeptId());
List<Long> deptIdList = superiorAndSubordinate.stream().map(SysDept::getDeptId).collect(Collectors.toList()); List<Long> deptIdList = superiorAndSubordinate.stream().map(SysDept::getDeptId).collect(Collectors.toList());
form.setDeptIdList(deptIdList); form.setDeptIdList(deptIdList);
startPage();
form.setFridge(NormalEnum.yes.getValue()); form.setFridge(NormalEnum.yes.getValue());
List<Yq> list = yqService.queryList(form); List<Yq> list = yqService.queryList(form);
return getDataTable(list);
return success(list);
} }
} }

Loading…
Cancel
Save