From b345cb8e52629084412b7b491d38e065aa0e94ad Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 1 Nov 2024 17:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=B5=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/task/mapper/TmTaskAuditLogMapper.java |  2 +-
 .../task/service/ITmTaskAuditLogService.java       |  2 +-
 .../service/impl/TmTaskAuditLogServiceImpl.java    |  6 +++---
 .../mapper/material/task/TmTaskAuditLogMapper.xml  | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

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<String> selectTmTaskAuditRoleKeyList(TmTaskAuditLog tmTaskAuditLog);
+    public List<String> 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<String> selectTmTaskAuditRoleKeyList(TmTaskAuditLog tmTaskAuditLog);
+    public List<String> 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<String> selectTmTaskAuditRoleKeyList(TmTaskAuditLog tmTaskAuditLog) {
-        return tmTaskAuditLogsMapper.selectTmTaskAuditRoleKeyList(tmTaskAuditLog);
+    public List<String> 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<String> auditRoleIds = selectTmTaskAuditRoleKeyList(tmTaskAuditLog);
+            List<String> 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"
         <result property="id"    column="id"    />
         <result property="taskId"    column="task_id"    />
         <result property="taskType"    column="task_type"    />
-        <result property="roleKey"    column="role_key"    />
+        <result property="roleId"    column="role_id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTmTaskAuditLogVo">
-        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
     </sql>
 
     <select id="selectTmTaskAuditLogList" parameterType="com.bonus.material.task.domain.TmTaskAuditLog" resultMap="TmTaskAuditLogResult">
@@ -24,11 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="taskId != null "> and task_id = #{taskId}</if>
             <if test="taskType != null "> and task_type = #{taskType}</if>
-            <if test="roleKey != null  and roleKey != ''"> and role_key = #{roleKey}</if>
+            <if test="roleId != null  and roleId != ''"> and role_id = #{roleId}</if>
         </where>
     </select>
 
-    <select id="selectTmTaskAuditRoleKeyList" parameterType="com.bonus.material.task.domain.TmTaskAuditLog" resultType="java.lang.String">
+    <select id="selectTmTaskAuditRoleList" parameterType="com.bonus.material.task.domain.TmTaskAuditLog" resultType="java.lang.String">
         select role_id
         from tm_task_audit_log
         <where>
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="taskId != null">task_id,</if>
             <if test="taskType != null">task_type,</if>
-            <if test="roleKey != null">role_key,</if>
+            <if test="roleId != null">role_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
             <if test="taskType != null">#{taskType},</if>
-            <if test="roleKey != null">#{roleKey},</if>
+            <if test="roleId != null">#{roleId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskId != null">task_id = #{taskId},</if>
             <if test="taskType != null">task_type = #{taskType},</if>
-            <if test="roleKey != null">role_key = #{roleKey},</if>
+            <if test="roleId != null">role_id = #{roleId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>