diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java index d2094fab1..73dd3241b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java @@ -92,8 +92,8 @@ public class LabelController { @Operation(summary = "获得分组标签列表") @PreAuthorize("@ss.hasPermission('system:label:query')") @OperateLog(enable = false) - public CommonResult>> getGroupList() { - return success(labelService.getGroupList()); + public CommonResult>> getGroupList(@RequestParam(value = "organId", required = false) Long organId) { + return success(labelService.getGroupList(organId)); } @GetMapping("/export-excel") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java index 10e47ff13..fcb784450 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java @@ -56,7 +56,7 @@ public interface LabelService { PageResult getLabelPage(LabelPageReqVO pageReqVO); - Map> getGroupList(); + Map> getGroupList(Long organId); List list(String type); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index e1410df03..d2ef749c7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -97,8 +97,8 @@ public class LabelServiceImpl implements LabelService { @Override - public Map> getGroupList() { - List LabelDOS = labelMapper.selectList(); + public Map> getGroupList(Long organId) { + List LabelDOS = labelMapper.selectList(new LambdaQueryWrapperX().eqIfPresent(LabelDO::getOrganId, organId)); List LabelRespVOS = BeanUtils.toBean(LabelDOS, LabelRespVO.class); return LabelRespVOS.stream().collect(Collectors.groupingBy(LabelRespVO::getType)); }