|
|
@ -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); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |