From 386ce06dded4ef660f0e1965b7544f4a23cad372 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Wed, 23 Jul 2025 11:25:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/WorkbenchController.java       |  2 +-
 .../com/example/demo/service/GeneralService.java   |  2 ++
 .../demo/serviceImpl/GeneralServiceImpl.java       | 23 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java
index ad9dab3..58912a8 100644
--- a/src/main/java/com/example/demo/controller/WorkbenchController.java
+++ b/src/main/java/com/example/demo/controller/WorkbenchController.java
@@ -72,7 +72,7 @@ public class WorkbenchController {
     @PostMapping("getGraph")
     public ResponseEntity<WorkbenchCard> graph1(@RequestBody WorkbenchCard workbench, @AuthenticationPrincipal Admin admin) {
         String account = admin.getAccount();
-        List<String> markets = generalService.getAdminMarket(account);
+        List<String> markets = generalService.getAdminMarket1(account);
 
 
         workbench.setMarkets(markets);
diff --git a/src/main/java/com/example/demo/service/GeneralService.java b/src/main/java/com/example/demo/service/GeneralService.java
index 67e4b5f..f253d12 100644
--- a/src/main/java/com/example/demo/service/GeneralService.java
+++ b/src/main/java/com/example/demo/service/GeneralService.java
@@ -36,6 +36,8 @@ public interface GeneralService {
     List<Date> getAllDatesBetween(Date start, Date end);
     //获取用户的地区权限列表
     List<String> getAdminMarket(String account) ;
+    //获取用户的地区权限列表(工作台图表专用)
+    List<String> getAdminMarket1(String account) ;
     //获取角色的地区
     String getRoleMarket(Integer roleId);
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
index f9b3ba5..59b490b 100644
--- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
@@ -143,6 +143,29 @@ public class GeneralServiceImpl implements GeneralService {
 
 
 }
+
+    @Override
+    public List<String> getAdminMarket1(String account) {
+        try {
+            String market = generalMapper.getAdminMarket(account);
+            if (market == null) {
+                throw new Exception("没有地区权限");
+            }
+            List<String> list = Arrays.asList(market.split(","));
+            //判断是否是总部
+            if (list != null && list.contains("总部")) {
+                list=getMarket();//总部有所有地区的权限
+            }
+            return list;
+        } catch (Exception e) {
+            // 记录日志
+            log.error("获取地区权限失败", e);
+            // 重新抛出异常，或者根据需要返回一个默认值或空列表
+            throw new RuntimeException("获取地区权限失败", e);
+        }
+
+    }
+
     /*
     获取觉得的地区列表
      */