防区、履职任务权限

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ResumptionRecordController.java

@@ -4,6 +4,7 @@ import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionNFCDto;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRecordPageDto;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRoleDto;
@@ -35,6 +36,7 @@ public class ResumptionRecordController extends BaseController {
 
     @ApiOperation(value = "履职记录分页")
     @GetMapping("/page")
+    @RequiresPermissions("resumption:taskManager")
     public TableDataInfo page(@Valid ResumptionRecordPageDto pageDto) {
         return resumptionRecordService.selectList(pageDto);
     }
@@ -46,6 +48,7 @@ public class ResumptionRecordController extends BaseController {
      */
     @ApiOperation(value = "履职记录详情")
     @GetMapping("/{id}")
+    @RequiresPermissions("resumption:taskManager:query")
     public AjaxResult detail(@PathVariable Long id) {
         List<ResumptionRecordInfoVo> list = resumptionRecordService.selectInfo(id);
         return success(list);
@@ -76,6 +79,7 @@ public class ResumptionRecordController extends BaseController {
 
     @ApiOperation(value = "履职记录NFC记录")
     @GetMapping("/nfc")
+    @RequiresPermissions("resumption:taskManager:query")
     public AjaxResult nfc(ResumptionNFCDto dto) {
         List<NFCRecordVo> list = resumptionRecordService.selectNFCRecord(dto);
         return success(list);
@@ -96,8 +100,8 @@ public class ResumptionRecordController extends BaseController {
      }*/
     @ApiOperation(value = "履职记录导出")
     @PostMapping("/export")
+    @RequiresPermissions("resumption:taskManager:export")
     public void export(@RequestBody ResumptionRecordPageDto pageDto, HttpServletResponse response) throws Exception {
-
         resumptionRecordService.export(pageDto, response);
     }
 }

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -24,7 +24,7 @@
         from core_protection a
         <if test="request.checkSub==true">
             inner join sys_org c
-            on a.org_id = c.id and c.deleted=0 and c.path like concat((select id from sys_org where id=#{request.orgId}),  '%')
+            on a.org_id = c.id and c.deleted=0 and c.path like concat((select path from sys_org where id=#{request.orgId}),  '%')
         </if>
         where a.deleted=0
         <if test="request.checkSub==false">