From fda182841a8258e355365c8ff16f28672b8523e6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:34 +0800
Subject: [PATCH] 联调问题修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationsServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationsServiceImpl.java
index 72641db..3748ef0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationsServiceImpl.java
@@ -2,14 +2,20 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.system.mapper.OaApprovalApplicationsMapper;
import com.ruoyi.system.model.OaApprovalApplications;
-import com.ruoyi.system.model.OaApprovalTodo;
import com.ruoyi.system.query.ApprovalTodoListQuery;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalApplicationsService;
+import com.ruoyi.system.service.TDeptService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -20,8 +26,10 @@
* @since 2025-09-15
*/
@Service
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class OaApprovalApplicationsServiceImpl extends ServiceImpl<OaApprovalApplicationsMapper, OaApprovalApplications> implements OaApprovalApplicationsService {
-
+ private final ISysUserService sysUserService;
+ private final TDeptService deptService;
@Override
public PageInfo<OaApprovalApplications> pageListAudit(ApprovalTodoListQuery query) {
PageInfo<OaApprovalApplications> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -29,4 +37,18 @@
pageInfo.setRecords( list);
return pageInfo;
}
+
+ @Override
+ public void assembleApplicationDetail(OaApprovalApplications app) {
+ //查询申请人名称
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(app.getApplicantUserId()));
+ if (Objects.nonNull(sysUser)) {
+ app.setApplicantName(sysUser.getNickName());
+ }
+ //查询部门信息
+ TDept dept = deptService.getById(app.getDeptId());
+ if (Objects.nonNull(dept)) {
+ app.setDeptName(dept.getDeptName());
+ }
+ }
}
--
Gitblit v1.7.1