wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 

 Conflicts:
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
This commit is contained in:
疯狂的狮子li 2020-03-24 15:29:45 +08:00
parent 67657e9f02 e07d4c18ee
commit 39d8723159
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -238,8 +238,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否并发："> <el-form-item label="是否并发：">
<div v-if="form.status == 0">允许</div> <div v-if="form.concurrent == 0">允许</div>
<div v-else-if="form.status == 1">禁止</div> <div v-else-if="form.concurrent == 1">禁止</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -259,7 +259,6 @@
</div> </div>
</template> </template>
<script> <script>
import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job"; import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job";
@ -486,4 +485,4 @@ export default {
} }
} }
}; };
</script> </script>

3
ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
View File

@ -96,7 +96,8 @@
from sys_menu m from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id left join sys_user_role ur on rm.role_id = ur.role_id
where ur.user_id = #{userId} left join sys_role r on r.role_id = ur.role_id
where m.visible = '0' and r.status = '0' and ur.user_id = #{userId}
</select> </select>
<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult"> <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">