Merge branch '陈航-修改已存在的问题' of sckj/mz-cloud into master

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysDeptJlMapper.xml

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null  and id != ''"> and a.code = #{id}</if>
             <if test="code != null  and code != ''"> and a.code = #{code}</if>
             <if test="name != null  and name != ''"> and a.name like concat('%', #{name}, '%')</if>
-            <if test="parentId != null  and parentId != ''"> and a.parent_id = (select id from sys_dept_jl where code = #{parentId} limit 1) </if>
+            <if test="parentId != null  and parentId != ''"> and a.parent_id = #{parentId} </if>
             <if test="level != null "> and level = #{level}</if>
         </where>
         order by a.code asc
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null  and id != ''"> and a.code = #{id}</if>
             <if test="code != null  and code != ''"> and a.code = #{code}</if>
             <if test="name != null  and name != ''"> and a.name like concat('%', #{name}, '%')</if>
-            <if test="parentId != null  and parentId != ''"> and (select id from sys_dept_jl where code = #{parentId}) = a.parent_id</if>
+            <if test="parentId != null  and parentId != ''"> and a.parent_id = #{parentId} </if>
             <if test="level != null "> and level = #{level}</if>
         </where>
         order by a.code asc

ruoyi-ui/src/views/system/zhgl/sqyljg/index.vue

@@ -49,8 +49,9 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          hasPermi="['organization:sqjgZhgl:add']"
         >新增</el-button>
-<!--        v-hasPermi="['system:zhgl:add']"-->
+        v-
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -383,7 +384,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row,is) {
-      console.log('ddddddddddddddddXXXXXXXXXXX', row)
       this.reset();
       const id = row.id || this.ids
       getZhgl(id).then(response => {

ruoyi-ui/src/views/system/zhgl/yljg/index.vue

@@ -23,7 +23,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['organization:yljgZhgl:add']">新增</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>