提交

jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDao.java

@@ -73,11 +73,20 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
     public PaymentRequestsVo getDetail(Long id) {
         PaymentRequestsTable pr = PaymentRequestsTable.pr;
 
+        // 部门
+        SysDeptTable sd = SysDeptTable.sd;
+        // 用户
+        SysUserTable su = SysUserTable.su;
+
         return sql(PaymentRequestsVo.class)
                 .select(
-                        pr.all
+                        pr.all,
+                        sd.name.as(PaymentRequestsVo::getDeptName),
+                        su.nickname.as(PaymentRequestsVo::getUserName)
                 )
                 .from(pr)
+                .leftJoin(sd).on(pr.deptId.eq(sd.id))
+                .leftJoin(su).on(pr.createUser.eq(su.id))
                 .where(
                         pr.id.eq(id)
                 )

jy-flow/src/main/java/com/jy/flow/controller/ExecuteController.java

@@ -184,7 +184,7 @@ public class ExecuteController {
      */
     @GetMapping("/doneList/{instanceId}")
     public List<HisTask> doneList(@PathVariable("instanceId") Long instanceId) {
-        List<HisTask> vo = hisTaskService.orderById().desc().list(new FlowHisTask().setInstanceId(instanceId));
+        List<HisTask> vo = hisTaskService.list(new FlowHisTask().setInstanceId(instanceId));
         if (vo.isEmpty()) {
             return vo;
         }