diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskAuditLogMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskAuditLogMapper.java index 9068cf04..b53ec482 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskAuditLogMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskAuditLogMapper.java @@ -32,7 +32,7 @@ public interface TmTaskAuditLogMapper { * @param tmTaskAuditLog 任务 * @return 任务集合 */ - public List selectTmTaskAuditRoleKeyList(TmTaskAuditLog tmTaskAuditLog); + public List selectTmTaskAuditRoleList(TmTaskAuditLog tmTaskAuditLog); /** * 新增任务 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/ITmTaskAuditLogService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/ITmTaskAuditLogService.java index d85aa08f..2e001501 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/ITmTaskAuditLogService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/ITmTaskAuditLogService.java @@ -33,7 +33,7 @@ public interface ITmTaskAuditLogService { * @param tmTaskAuditLog 任务 * @return 任务集合 */ - public List selectTmTaskAuditRoleKeyList(TmTaskAuditLog tmTaskAuditLog); + public List selectTmTaskAuditRoleList(TmTaskAuditLog tmTaskAuditLog); /** * 新增任务 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskAuditLogServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskAuditLogServiceImpl.java index 27c8b917..55d426a8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskAuditLogServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskAuditLogServiceImpl.java @@ -57,8 +57,8 @@ public class TmTaskAuditLogServiceImpl implements ITmTaskAuditLogService { * @param tmTaskAuditLog 任务 * @return 任务集合 */ - public List selectTmTaskAuditRoleKeyList(TmTaskAuditLog tmTaskAuditLog) { - return tmTaskAuditLogsMapper.selectTmTaskAuditRoleKeyList(tmTaskAuditLog); + public List selectTmTaskAuditRoleList(TmTaskAuditLog tmTaskAuditLog) { + return tmTaskAuditLogsMapper.selectTmTaskAuditRoleList(tmTaskAuditLog); } /** @@ -126,7 +126,7 @@ public class TmTaskAuditLogServiceImpl implements ITmTaskAuditLogService { if (CollectionUtils.isEmpty(needRoles)) { return new TmTaskAuditResult(true); } else { - List auditRoleIds = selectTmTaskAuditRoleKeyList(tmTaskAuditLog); + List auditRoleIds = selectTmTaskAuditRoleList(tmTaskAuditLog); String nextRole = needRoles.get(0); boolean finished = false; for (int i = 0; i < needRoles.size(); i++) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAuditLogMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAuditLogMapper.xml index 4ede6c8a..86dde170 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAuditLogMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAuditLogMapper.xml @@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, task_id, task_type, role_key, create_by, create_time, update_by, update_time, remark from tm_task_audit_log + select id, task_id, task_type, role_id, create_by, create_time, update_by, update_time, remark from tm_task_audit_log - select role_id from tm_task_audit_log @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" task_id, task_type, - role_key, + role_id, create_by, create_time, update_by, @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{taskId}, #{taskType}, - #{roleKey}, + #{roleId}, #{createBy}, #{createTime}, #{updateBy}, @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" task_id = #{taskId}, task_type = #{taskType}, - role_key = #{roleKey}, + role_id = #{roleId}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy},