LY rc审计助手

master/src/main/java/com/ruoyi/project/ehs/controller/TRcauditmenuController.java

@@ -48,7 +48,7 @@ public class TRcauditmenuController extends BaseController
     /**
      * 查询RC审计助手目录列表
      */
-    @PreAuthorize("@ss.hasPermi('ehs:rcauditmenu:list')")
+    @PreAuthorize("@ss.hasPermi('ehs:rcaudit:list')")
     @GetMapping("/list")
     public TableDataInfo list(TRcauditmenu tRcauditmenu)
     {
@@ -70,7 +70,7 @@ public class TRcauditmenuController extends BaseController
     /**
      * 导出RC审计助手目录列表
      */
-    @PreAuthorize("@ss.hasPermi('ehs:rcauditmenu:export')")
+    @PreAuthorize("@ss.hasPermi('ehs:rcaudit:export')")
     @Log(title = "RC审计助手目录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TRcauditmenu tRcauditmenu)
@@ -83,7 +83,7 @@ public class TRcauditmenuController extends BaseController
     /**
      * 获取RC审计助手目录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('ehs:rcauditmenu:query')")
+    @PreAuthorize("@ss.hasPermi('ehs:rcaudit:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -93,7 +93,7 @@ public class TRcauditmenuController extends BaseController
     /**
      * 新增RC审计助手目录
      */
-    @PreAuthorize("@ss.hasPermi('ehs:rcauditmenu:add')")
+    @PreAuthorize("@ss.hasPermi('ehs:rcaudit:add')")
     @Log(title = "RC审计助手目录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TRcauditmenu tRcauditmenu)
@@ -125,7 +125,7 @@ public class TRcauditmenuController extends BaseController
     /**
      * 修改RC审计助手目录
      */
-    @PreAuthorize("@ss.hasPermi('ehs:rcauditmenu:edit')")
+    @PreAuthorize("@ss.hasPermi('ehs:rcaudit:edit')")
     @Log(title = "RC审计助手目录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TRcauditmenu tRcauditmenu)
@@ -158,7 +158,7 @@ public class TRcauditmenuController extends BaseController
     /**
      * 删除RC审计助手目录
      */
-    @PreAuthorize("@ss.hasPermi('ehs:rcauditmenu:remove')")
+    @PreAuthorize("@ss.hasPermi('ehs:rcaudit:remove')")
     @Log(title = "RC审计助手目录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -169,7 +169,7 @@ public class TRcauditmenuController extends BaseController
     /**
      * 批量导入RC审计助手
      */
-    @PreAuthorize("@ss.hasPermi('ehs:rcauditmenu:add')")
+    @PreAuthorize("@ss.hasPermi('ehs:rcaudit:add')")
     @Log(title = "RC审计助手目录", businessType = BusinessType.INSERT)
     @PostMapping("/importData")
     public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException

master/src/main/resources/mybatis/ehs/TRcauditMapper.xml

@@ -29,13 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTRcauditVo">
         select p.name_cn as menuName, d.id, d.plant_code, d.rc_code, d.menuid, d.name_cn, d.name_en, d.yes, d.no, d.na, d.link, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id ,s.dept_name, d.file_num from t_rcaudit d
       left join sys_dept s on s.dept_id = d.dept_id
-      left join t_rcauditmenu p on p.serial_num = d.menuid
+      left join t_rcauditmenu p on p.serial_num = d.menuid and d.dept_id = p.dept_id
     </sql>
 
     <select id="selectTRcauditList" parameterType="TRcaudit" resultMap="TRcauditResult">
         <include refid="selectTRcauditVo"/>
         <where>
             <if test="menuid != null  and menuid != ''"> and menuid = #{menuid}</if>
+            <if test="deptId != null  and deptId != ''"> and d.dept_id = #{deptId}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

ui/src/views/ehs/rcaudit/index.vue

@@ -593,6 +593,7 @@
       // 节点单击事件
       handleNodeClick(data) {
         this.queryParams.menuid = data.serialNum;
+        this.queryParams.deptId = data.deptId;
         this.getList();
       },
       /** 重置按钮操作 */

ui/src/views/ehs/rcauditmenu/index.vue

@@ -14,7 +14,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['ehs:rcauditmenu:add']"
+          v-hasPermi="['ehs:rcaudit:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -24,7 +24,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['ehs:rcauditmenu:edit']"
+          v-hasPermi="['ehs:rcaudit:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -34,7 +34,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['ehs:rcauditmenu:remove']"
+          v-hasPermi="['ehs:rcaudit:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
         <el-col :span="1.5">
@@ -43,7 +43,7 @@
                     icon="el-icon-upload2"
                     size="mini"
                     @click="handleImport"
-                    v-hasPermi="['ehs:rcauditmenu:edit']"
+                    v-hasPermi="['ehs:rcaudit:edit']"
             >{{ $t('导入') }}</el-button>
         </el-col>
       <el-col :span="1.5">
@@ -52,7 +52,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['ehs:rcauditmenu:export']"
+          v-hasPermi="['ehs:rcaudit:export']"
         >{{ $t('导出') }}</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -71,14 +71,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['ehs:rcauditmenu:edit']"
+            v-hasPermi="['ehs:rcaudit:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['ehs:rcauditmenu:remove']"
+            v-hasPermi="['ehs:rcaudit:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>