安全信息类目菜单调整，权限字符修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpClassifyDetailedController.java

@@ -54,7 +54,8 @@ public class LabXxpClassifyDetailedController extends BaseController
     /**
      * 查询安全信息类目详情列表
      */
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.LIST)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.LIST)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询安全信息类目详情列表")
     public TableDataInfo<XxpClassifyDetailVO> list(XxpClassifyDetailVO classifyDetailed)
@@ -69,7 +70,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 导出安全信息类目详情列表
      */
     @ApiOperation(value = "导出安全信息类目详情列表")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EXPORT)
+   // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EXPORT)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.EXPORT)
     @Log(title = "安全信息类目详情", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, XxpClassifyDetailVO classifyDetailed) throws IOException
@@ -83,7 +85,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 获取安全信息类目详情详细信息
      */
     @ApiOperation(value = "获取安全信息类目详情详细信息")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.QUERY)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.QUERY)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.QUERY)
     @GetMapping(value = "/{id}")
     public ResultData<XxpClassifyDetail> getInfo(@PathVariable("id") Long id)
     {
@@ -95,7 +98,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 新增安全信息类目详情
      */
     @ApiOperation(value = "新增安全信息类目详情")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.ADD)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.ADD)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.ADD)
     @Log(title = "安全信息类目详情", businessType = BusinessType.INSERT)
     @PostMapping
     public ResultData add(@RequestBody XxpClassifyDetail classifyDetailed)
@@ -109,7 +113,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 修改安全信息类目详情
      */
     @ApiOperation(value = "修改安全信息类目详情")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EDIT)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.EDIT)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.EDIT)
     @Log(title = "安全信息类目详情", businessType = BusinessType.UPDATE)
     @PutMapping
     public ResultData edit(@RequestBody XxpClassifyDetail classifyDetailed)
@@ -121,7 +126,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * 删除安全信息类目详情
      */
     @ApiOperation(value = "删除安全信息类目详情")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+    //@PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.REMOVE)
     @Log(title = "安全信息类目详情", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public ResultData remove(@PathVariable Long[] ids)
@@ -135,7 +141,8 @@ public class LabXxpClassifyDetailedController extends BaseController
      * @return
      */
     @ApiOperation(value = "根据id删除安全信息类目详情关联关系")
-    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+   // @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY_DET + PerFun.REMOVE)
+    @PreAuthorize(hasPermi = PerPrefix.LABORATORY_CLASSIFY + PerFun.REMOVE)
     @Log(title = "安全信息类目详情", businessType = BusinessType.DELETE)
     @PostMapping("/{id}")
     public ResultData remove(@PathVariable Long id)