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:
commit
39d8723159
|
@ -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";
|
||||||
|
|
||||||
|
|
|
@ -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">
|
||||||
|
|
Loading…
Reference in New Issue