店内执行查看/修改权限，关联角色与部门

src/main/java/com/sfa/operation/controller/sales/core/ApDisplayCoreController.java

 package com.sfa.operation.controller.sales.core;
 
+import com.sfa.common.core.constant.RoleConstants;
 import com.sfa.common.core.enums.ECode;
 import com.sfa.common.core.exception.CheckedException;
 import com.sfa.common.security.utils.SecurityUtils;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.service.qc.IQinceMarketEmployeeService;
 import com.sfa.operation.service.sales.IApDisplayCoreService;
+import com.sfa.system.api.domain.SysRole;
 import com.sfa.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author : liqiulin
@@ -77,11 +80,18 @@ public class ApDisplayCoreController {
     private void checkPermission(){
         // 是区域销售部的人员，查看人客关系
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String empNo = loginUser.getUsername();
-        List<String> dealerCodes = qinceMarketEmployeeService.checkPermission(empNo);
-        if (dealerCodes.isEmpty()){
-            throw new CheckedException(ECode.QC_MARKET_EMP_ERROR);
+        // 只有销售（促销AP管理：cxapgl）、大区TM（大区TM促销AP管理：dqtmcxapgl）两种角色才可以修改
+        List<SysRole> roles = loginUser.getSysUser().getRoles();
+        Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey()) || RoleConstants.OPERATION_AP_MANAGER.equals(role.getRoleKey())).findFirst();
+        if (!first.isPresent()) {
+            throw new CheckedException(ECode.ZZ_PRODUCT_QUALITY_AP_ERROR);
         }
+
+//        String empNo = loginUser.getUsername();
+//        List<String> dealerCodes = qinceMarketEmployeeService.checkPermission(empNo);
+//        if (dealerCodes.isEmpty()){
+//            throw new CheckedException(ECode.QC_MARKET_EMP_ERROR);
+//        }
     }
 
 }

src/main/java/com/sfa/operation/controller/sales/core/ApPromotionCoreController.java

 package com.sfa.operation.controller.sales.core;
 
+import com.sfa.common.core.constant.RoleConstants;
 import com.sfa.common.core.enums.ECode;
 import com.sfa.common.core.exception.CheckedException;
 import com.sfa.common.security.utils.SecurityUtils;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.service.qc.IQinceMarketEmployeeService;
 import com.sfa.operation.service.sales.IApPromotionCoreService;
+import com.sfa.system.api.domain.SysRole;
 import com.sfa.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author : liqiulin
@@ -34,10 +37,17 @@ public class ApPromotionCoreController {
     private void checkPermission(){
         // 是区域销售部的人员，查看人客关系
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String empNo = loginUser.getUsername();
-        List<String> dealerCodes = qinceMarketEmployeeService.checkPermission(empNo);
-        if (dealerCodes.isEmpty()){
-            throw new CheckedException(ECode.QC_MARKET_EMP_ERROR);
+        // 只有销售（促销AP管理：cxapgl）、大区TM（大区TM促销AP管理：dqtmcxapgl）两种角色才可以修改
+        List<SysRole> roles = loginUser.getSysUser().getRoles();
+        Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey()) || RoleConstants.OPERATION_AP_MANAGER.equals(role.getRoleKey())).findFirst();
+        if (!first.isPresent()) {
+            throw new CheckedException(ECode.ZZ_PRODUCT_QUALITY_AP_ERROR);
         }
+
+//        String empNo = loginUser.getUsername();
+//        List<String> dealerCodes = qinceMarketEmployeeService.checkPermission(empNo);
+//        if (dealerCodes.isEmpty()){
+//            throw new CheckedException(ECode.QC_MARKET_EMP_ERROR);
+//        }
     }
 }

src/main/java/com/sfa/operation/controller/sales/query/ApDisplayQueryController.java

 package com.sfa.operation.controller.sales.query;
 
+import com.sfa.common.core.constant.RoleConstants;
+import com.sfa.common.core.enums.ECode;
+import com.sfa.common.core.exception.CheckedException;
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.common.security.annotation.RequiresPermissions;
 import com.sfa.common.security.utils.SecurityUtils;
@@ -7,6 +10,7 @@ import com.sfa.operation.config.ConstantValue;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.service.qc.IQinceMarketEmployeeService;
 import com.sfa.operation.service.sales.IApDisplayQueryService;
+import com.sfa.system.api.domain.SysRole;
 import com.sfa.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author : liqiulin
@@ -93,15 +98,25 @@ public class ApDisplayQueryController {
             return;
         }
 
-        // 是区域销售部的人员，查看人客关系
+        // 是区域销售部的人员：1、销售查看人客关系；2、大区TM查看当前部门下所有数据
+        // 判断是否是大区TM
+        List<SysRole> roles = loginUser.getSysUser().getRoles();
+        Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey())).findFirst();
+        if (first.isPresent()) {
+            String deptName = loginUser.getSysUser().getDept().getDeptName();
+            salesApRequest.setDeptName(deptName);
+            return;
+        }
+        // 不是大区TM，判断是否是销售人员
         String empNo = loginUser.getUsername();
         List<String> dealerCodes = qinceMarketEmployeeService.checkPermission(empNo);
 
-        // 没有人客关系，根据部门查询
+        // 没有人客关系
         if (dealerCodes.isEmpty()) {
-            String deptName = loginUser.getSysUser().getDept().getDeptName();
-            salesApRequest.setDeptName(deptName);
-            return;
+            throw new CheckedException(ECode.QC_MARKET_EMP_ERROR);
+//            String deptName = loginUser.getSysUser().getDept().getDeptName();
+//            salesApRequest.setDeptName(deptName);
+//            return;
         }
         // 有人客关系，根据负责经销商查询
         salesApRequest.setDealerCodes(dealerCodes);

src/main/java/com/sfa/operation/controller/sales/query/ApPromotionQueryController.java

 package com.sfa.operation.controller.sales.query;
 
+import com.sfa.common.core.constant.RoleConstants;
+import com.sfa.common.core.enums.ECode;
+import com.sfa.common.core.exception.CheckedException;
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.common.security.utils.SecurityUtils;
 import com.sfa.operation.config.ConstantValue;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.service.qc.IQinceMarketEmployeeService;
 import com.sfa.operation.service.sales.IApPromotionQueryService;
+import com.sfa.system.api.domain.SysRole;
 import com.sfa.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author : liqiulin
@@ -48,16 +53,26 @@ public class ApPromotionQueryController {
             return;
         }
 
-        // 是区域销售部的人员，查看人客关系
-        String empNo = loginUser.getNickName();
-        List<String> dealerCodes = qinceMarketEmployeeService.checkPermission(empNo);
-
-        // 没有人客关系，根据部门查询
-        if (dealerCodes.isEmpty()) {
+        // 是区域销售部的人员：1、销售查看人客关系；2、大区TM查看当前部门下所有数据
+        // 判断是否是大区TM
+        List<SysRole> roles = loginUser.getSysUser().getRoles();
+        Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey())).findFirst();
+        if (first.isPresent()) {
             String deptName = loginUser.getSysUser().getDept().getDeptName();
             salesApRequest.setDeptName(deptName);
             return;
         }
+        // 不是大区TM，判断是否是销售人员
+        String empNo = loginUser.getUsername();
+        List<String> dealerCodes = qinceMarketEmployeeService.checkPermission(empNo);
+
+        // 没有人客关系
+        if (dealerCodes.isEmpty()) {
+            throw new CheckedException(ECode.QC_MARKET_EMP_ERROR);
+//            String deptName = loginUser.getSysUser().getDept().getDeptName();
+//            salesApRequest.setDeptName(deptName);
+//            return;
+        }
         // 有人客关系，根据负责经销商查询
         salesApRequest.setDealerCodes(dealerCodes);
     }