Przeglądaj źródła

网点负责人 在 APP端,履职情况表、监控情况表、行社检查情况表、网点自查情况表 可查看到数据

zhulu 1 rok temu
rodzic
commit
5b35878743

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/controller/MonitorAccessReportController.java

@@ -39,7 +39,7 @@ public class MonitorAccessReportController {
     @Resource
     private RemoteOrgService remoteOrgService;
     @ApiOperation(value = "监控调阅报表")
-    @RequiresPermissions("core:monitorAccessReport:list")
+//    @RequiresPermissions("core:monitorAccessReport:list")
     @GetMapping("/list")
     public AjaxResult list(MonitoringAccessDTO monitoringAccessDTO) {
         if (null==monitoringAccessDTO.getStartDate()||null==monitoringAccessDTO.getEndDate()){

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -114,7 +114,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
             sysOrgs = remoteOrgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
-        } else if (sysOrg.getType() == 3) {
+        } else if (sysOrg.getType() == 3 || sysOrg.getType() == 4) {
             sysOrgs = remoteOrgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/controller/ResumptionReportController.java

@@ -61,7 +61,7 @@ public class ResumptionReportController {
     }
 
     @ApiOperation(value = "每日安全保卫履职-日报表",notes = "web端与App共用此接口")
-    @RequiresPermissions("core:resumptionReport:list")
+//    @RequiresPermissions("core:resumptionReport:list")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody ResumptionDTO resumptionDTO) throws ExecutionException, InterruptedException, TimeoutException {
         if (null == resumptionDTO.getSearchTime()) {

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/service/impl/ResumptionReportServiceImpl.java

@@ -65,7 +65,7 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
             sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
-        } else if (sysOrg.getType() == 3) {
+        } else if (sysOrg.getType() == 3 || sysOrg.getType() == 4) {
             sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();

+ 2 - 2
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/controller/SafetyInspectReportController.java

@@ -40,7 +40,7 @@ public class SafetyInspectReportController {
     private RemoteOrgService remoteOrgService;
 
     @ApiOperation(value = "行社全面检查情况表",notes = "web端与App共用此接口")
-    @RequiresPermissions("core:safetyInspectReport:list")
+//    @RequiresPermissions("core:safetyInspectReport:list")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody SafetyInspectDTO safetyInspectDTO) throws Exception {
         if (null == safetyInspectDTO.getYear()) {
@@ -60,7 +60,7 @@ public class SafetyInspectReportController {
     }
 
     @ApiOperation(value = "网点负责人自查情况表",notes = "web端与App共用此接口")
-    @RequiresPermissions("core:safetyInspectReport:list")
+//    @RequiresPermissions("core:safetyInspectReport:list")
     @PostMapping("/selfInspectList")
     public AjaxResult selfInspectList(@RequestBody SafetyInspectDTO safetyInspectDTO)throws Exception {
         AjaxResult ajax = AjaxResult.success();