From 1149d126e7f4c78315f1a8ba90842ba4f7ab12b6 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Thu, 11 Apr 2024 11:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=BE=97=E5=88=86=E7=BB=84=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87id=E5=8F=82=E6=95=B0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/controller/admin/label/LabelController.java | 4 ++--
 .../com/cf/imes/module/system/service/lable/LabelService.java | 2 +-
 .../cf/imes/module/system/service/lable/LabelServiceImpl.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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<Map<String, List<LabelRespVO>>> getGroupList() {
-        return success(labelService.getGroupList());
+    public CommonResult<Map<String, List<LabelRespVO>>> 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<LabelDO> getLabelPage(LabelPageReqVO pageReqVO);
 
 
-    Map<String, List<LabelRespVO>> getGroupList();
+    Map<String, List<LabelRespVO>> getGroupList(Long organId);
 
     List<LabelDO> 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<String, List<LabelRespVO>> getGroupList() {
-        List<LabelDO> LabelDOS = labelMapper.selectList();
+    public Map<String, List<LabelRespVO>> getGroupList(Long organId) {
+        List<LabelDO> LabelDOS = labelMapper.selectList(new LambdaQueryWrapperX<LabelDO>().eqIfPresent(LabelDO::getOrganId, organId));
         List<LabelRespVO> LabelRespVOS = BeanUtils.toBean(LabelDOS, LabelRespVO.class);
         return LabelRespVOS.stream().collect(Collectors.groupingBy(LabelRespVO::getType));
     }