1、恢复权限标识符2、查询分组信息按照人员隔离开

src/main/java/com/link/report/controller/core/CustomerReportCoreController.java

@@ -3,6 +3,7 @@ package com.link.report.controller.core;
 import com.link.report.pojo.request.CustomerReportAddVo;
 import com.link.report.service.CustomerReportService;
 import com.sfa.common.core.domain.R;
+import com.sfa.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,7 +22,7 @@ public class CustomerReportCoreController {
     @Autowired
     CustomerReportService customerReportService;
 
-//    @RequiresPermissions("bi:supply:list")
+    @RequiresPermissions("bi:supply:list")
     @PostMapping("/save")
     public R save(@RequestBody CustomerReportAddVo customerReportAddVo) {
         customerReportService.save(customerReportAddVo);

src/main/java/com/link/report/controller/core/CustomerReportGroupCoreController.java

@@ -3,6 +3,7 @@ package com.link.report.controller.core;
 import com.link.report.pojo.request.CustomerReportGroupVo;
 import com.link.report.service.CustomerReportGroupService;
 import com.sfa.common.core.domain.R;
+import com.sfa.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +24,7 @@ public class CustomerReportGroupCoreController {
     @Autowired
     CustomerReportGroupService customerReportGroupService;
 
-//    @RequiresPermissions("bi:supply:list")
+    @RequiresPermissions("bi:supply:list")
     @PostMapping("/group/save")
     public R insertOrUpdate(@RequestBody List<CustomerReportGroupVo> vos) {
         customerReportGroupService.save(vos);

src/main/java/com/link/report/controller/query/CustomerReportGroupQueryController.java

@@ -4,6 +4,7 @@ import com.link.report.pojo.request.CustomerReportQueryListVo;
 import com.link.report.pojo.response.CustomerReportGroupResDto;
 import com.link.report.service.CustomerReportGroupService;
 import com.sfa.common.core.domain.R;
+import com.sfa.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +24,7 @@ public class CustomerReportGroupQueryController {
     @Autowired
     CustomerReportGroupService customerReportGroupService;
 
-//    @RequiresPermissions("bi:supply:list")
+    @RequiresPermissions("bi:supply:list")
     @GetMapping("/group/list")
     public R<List<CustomerReportGroupResDto>> queryList(CustomerReportQueryListVo vo) {
         List<CustomerReportGroupResDto> dtos =  customerReportGroupService.queryList(vo);

src/main/java/com/link/report/controller/query/CustomerReportQueryController.java

@@ -3,6 +3,7 @@ package com.link.report.controller.query;
 import com.link.report.pojo.response.CustomerReportListDto;
 import com.link.report.service.CustomerReportService;
 import com.sfa.common.core.domain.R;
+import com.sfa.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +23,7 @@ public class CustomerReportQueryController {
     @Autowired
     CustomerReportService customerReportService;
 
-//    @RequiresPermissions("bi:supply:list")
+    @RequiresPermissions("bi:supply:list")
     @GetMapping("/list")
     public R<List<CustomerReportListDto>> queryList() {
         List<CustomerReportListDto> customerReportListDtos = customerReportService.queryCustomerReportList();

src/main/java/com/link/report/controller/query/ReportShareQueryController.java

@@ -6,6 +6,7 @@ import com.link.report.service.ReportShareService;
 import com.sfa.common.core.domain.R;
 import com.sfa.common.core.web.controller.BaseController;
 import com.sfa.common.datascope.annotation.DataScope;
+import com.sfa.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,7 +35,7 @@ public class ReportShareQueryController extends BaseController {
      */
     @DataScope(deptAlias = "d", userAlias = "u")
     @GetMapping("/list")
-//    @RequiresPermissions("bi:supply:list")
+    @RequiresPermissions("bi:supply:list")
     public R<List<ReportShareBiListDto>> selectList(ReportShareListVo reportShareListVo) {
         List<ReportShareBiListDto> reportShareBiListDtos = reportShareService.selectList(reportShareListVo);
         return R.ok(reportShareBiListDtos);

src/main/java/com/link/report/domain/dao/impl/CustomerReportGroupDaoImpl.java

@@ -22,7 +22,7 @@ public class CustomerReportGroupDaoImpl implements CustomerReportGroupDao {
     @Override
     public List<CustomerReportGroupQueryListDto>  queryList() {
         // 更加登录人id查询
-        Long userId = SecurityUtils.getUserId();
+        Long userId = SecurityUtils.getLoginUser().getUserid();
         List<CustomerReportGroupQueryListDto> list = reportGroupMapper.queryReportGroupList(String.valueOf(userId));
         return list;
 

src/main/java/com/link/report/service/impl/CustomerReportGroupServiceImpl.java

@@ -77,7 +77,8 @@ public class CustomerReportGroupServiceImpl implements CustomerReportGroupServic
     @Override
     public void save(List<CustomerReportGroupVo> customerReportGroupVo) {
         // 新增或者修改  先删除后新增
-        Long userId = SecurityUtils.getUserId();
+
+        Long userId = SecurityUtils.getLoginUser().getUserid();
         customerReportGroupDao.deleteByCreatorId(userId);
 
         // 新增