我的待办

blade-service/blade-desk/src/main/java/org/springblade/desk/common/mapper/ApprovalRecordMapper.xml

@@ -25,6 +25,7 @@
     <resultMap id="mesApprovalRecordVOResultMap" type="org.springblade.desk.common.pojo.vo.MyMesApprovalRecordVO" extends="mesApprovalRecordResultMap">
         <result column="APPROVAL_STATUS" property="approvalStatus"/>
         <result column="APPROVAL_TIME" property="approvalTime"/>
+        <result column="CREATE_USER_NAME" property="createUserName"/>
     </resultMap>
 
 
@@ -37,8 +38,9 @@
     </select>
 
     <select id="selectMyToDoPage" resultMap="mesApprovalRecordVOResultMap">
-        SELECT DISTINCT t1.*
+        SELECT DISTINCT t1.*, bu.REAL_NAME AS CREATE_USER_NAME
         FROM MES_APPROVAL_RECORD t1
+        LEFT JOIN BLADE_USER bu ON t1.CREATE_USER = bu.id
         WHERE t1.STATUS = 0
           AND t1.IS_DELETED = 0
           AND (
@@ -81,10 +83,11 @@
     </select>
 
     <select id="selectMyDonePage" resultMap="mesApprovalRecordVOResultMap">
-        SELECT DISTINCT t1.*, t3.STATUS as APPROVAL_STATUS, t3.APPROVAL_TIME
+        SELECT DISTINCT t1.*, t3.STATUS as APPROVAL_STATUS, t3.APPROVAL_TIME, bu.REAL_NAME AS CREATE_USER_NAME
         FROM MES_APPROVAL_RECORD t1
         INNER JOIN MES_APPROVAL_RECORD_HANDLE_LOG t3
         ON t1.ID = t3.RECORD_ID AND t3.APPROVAL_USER = #{loginUserId} AND t3.IS_DELETED = 0
+        LEFT JOIN BLADE_USER bu ON t1.CREATE_USER = bu.id
         WHERE t1.IS_DELETED = 0
         <if test="mesApprovalRecord.bizType != null and mesApprovalRecord.bizType != ''">
             AND t1.BIZ_TYPE = #{mesApprovalRecord.bizType}

blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesApprovalRecordServiceImpl.java

@@ -80,7 +80,6 @@ public class MesApprovalRecordServiceImpl extends BaseServiceImpl<MesApprovalRec
         }
         if (CollectionUtils.isNotEmpty(vos)) {
             vos.forEach(vo -> {
-                vo.setCreateUserName(AuthUtil.getUserName());
                 vo.setApprovalStatusName(buildStatusName(vo.getApprovalStatus()));
             });
         }