员工申请调岗

pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserTransactionMapper.xml

@@ -24,6 +24,7 @@
 
     <sql id="selectA">
         select a.id,
+               a.apply_user_id,
                a.user_id,
                a.biz_id,
                a.biz_type,
@@ -79,19 +80,30 @@
         </if>
     </sql>
 
-    <select id="scopePageJoin" resultType="com.bsd.pjcloud.admin.api.vo.SysUserTransactionVo">
+    <sql id="selectJoin">
         <include refid="selectA"/>
         soureD.name as sourceDeptName,
         targetD.name as targetDeptName,
-        u.username as username,
+        u.name as username,
         u.phone as userMobile,
-        u.avatar as userAvatar
+        u.avatar as userAvatar,
+        applyU.name as applyUsername
         from sys_user_transaction a
         left join sys_dept soureD on soureD.dept_id = a.source_dept_id
         left join sys_dept targetD on targetD.dept_id = a.target_dept_id
         left join sys_user u on u.user_id = a.user_id
+        left join sys_user applyU on applyU.user_id = a.apply_user_id
+    </sql>
+
+    <select id="scopePageJoin" resultType="com.bsd.pjcloud.admin.api.vo.SysUserTransactionVo">
+        <include refid="selectJoin" />
         <where>
             <include refid="whereA"/>
         </where>
     </select>
+
+    <select id="join" resultType="com.bsd.pjcloud.admin.api.vo.SysUserTransactionVo">
+        <include refid="selectJoin"/>
+        where a.id = #{id}
+    </select>
 </mapper>