From fb19dd3e4e7e99f3c11d91a35b5eccfb64bd4dc0 Mon Sep 17 00:00:00 2001
From: yongdaidai <7805924+yongdaidai@user.noreply.gitee.com>
Date: Fri, 31 Jul 2020 14:59:23 +0800
Subject: [PATCH] update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
---
ruoyi-ui/src/views/monitor/job/log.vue | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/log.vue b/ruoyi-ui/src/views/monitor/job/log.vue
index 7346801..254f486 100644
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -87,7 +87,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['monitor:jobLog:export']"
+ v-hasPermi="['monitor:job:export']"
>导出</el-button>
</el-col>
</el-row>
@@ -127,7 +127,7 @@
/>
<!-- 调度日志详细 -->
- <el-dialog title="调度日志详细" :visible.sync="open" width="700px">
+ <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">
@@ -196,9 +196,7 @@
jobName: undefined,
jobGroup: undefined,
status: undefined
- },
- // 表单参数
- form: {}
+ }
};
},
created() {
--
Gitblit v1.9.2