From 60ba44bf8857b9d130fca10de475a7588baf02f5 Mon Sep 17 00:00:00 2001
From: okayliao <okayliao@gmail.com>
Date: Tue, 22 Jan 2019 15:44:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Mapper=20=E6=96=87=E4=BB=B6=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/quartz/mapper/SysJobLogMapper.java  | 10 +++++++++-
 .../java/com/ruoyi/quartz/mapper/SysJobMapper.java     |  5 +++--
 .../main/resources/mapper/quartz/SysJobLogMapper.xml   |  2 +-
 .../main/resources/mapper/system/SysRoleDeptMapper.xml |  4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
index 083c4e46..23bd9321 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
@@ -1,8 +1,9 @@
 package com.ruoyi.quartz.mapper;
 
-import java.util.List;
 import com.ruoyi.quartz.domain.SysJobLog;
 
+import java.util.List;
+
 /**
  * 调度任务日志信息 数据层
  * 
@@ -18,6 +19,13 @@ public interface SysJobLogMapper
      */
     public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
+    /**
+     * 查询所有调度任务日志
+     *
+     * @return 调度任务日志列表
+     */
+    public List<SysJobLog> selectJobLogAll();
+
     /**
      * 通过调度任务日志ID查询调度信息
      * 
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
index 34fd6184..e87cf7ae 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
@@ -1,8 +1,9 @@
 package com.ruoyi.quartz.mapper;
 
-import java.util.List;
 import com.ruoyi.quartz.domain.SysJob;
 
+import java.util.List;
+
 /**
  * 调度任务信息 数据层
  * 
@@ -47,7 +48,7 @@ public interface SysJobMapper
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteJobLogByIds(Long[] ids);
+    public int deleteJobByIds(Long[] ids);
 
     /**
      * 修改调度任务信息
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
index 5353deb1..4c4706a7 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 	</select>
 	
-	<select id="selectJobAll" resultMap="SysJobLogResult">
+	<select id="selectJobLogAll" resultMap="SysJobLogResult">
 		<include refid="selectJobLogVo"/>
 	</select>
 	
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
index cfbfd48b..700671e1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<resultMap type="SysRoleDept" id="SysRoleDeptResult">
 		<result property="roleId"     column="role_id"      />
-		<result property="detpId"     column="dept_id"      />
+		<result property="deptId"     column="dept_id"      />
 	</resultMap>
 
 	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</delete>
 	
 	<select id="selectCountRoleDeptByDeptId" resultType="Integer">
-	    select count(1) from sys_role_dept where dept_id=#{detpId}  
+	    select count(1) from sys_role_dept where dept_id=#{deptId}
 	</select>
 	
 	<delete id="deleteRoleDept" parameterType="Long">