diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/TransferFileDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/TransferFileDto.java
index e9a5d35..fa23549 100644
--- a/bonus-admin/src/main/java/com/bonus/web/domain/TransferFileDto.java
+++ b/bonus-admin/src/main/java/com/bonus/web/domain/TransferFileDto.java
@@ -27,6 +27,22 @@ public class TransferFileDto {
* 项目ID
*/
private String proId;
+ /**
+ * 项目名称
+ */
+ private String proName;
+ /**
+ * 项目单向名称
+ */
+ private String singleProName;
+ /**
+ * 项目单向名称
+ */
+ private String contentName;
+ /**
+ * 项目单向名称
+ */
+ private String parParentName;
/**
* 系统资源文件ID(关联 da_ky_sys_file_source.id)
@@ -73,7 +89,6 @@ public class TransferFileDto {
*/
private String updateTime;
- private String parParentName;
private String parentName;
}
diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java
index f840065..e18b04e 100644
--- a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java
+++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java
@@ -63,6 +63,7 @@ public class TransferApplyServiceImpl implements TransferApplyService {
@Override
public TransferApplyDto getTransferApply(TransferApplyDto dto) {
+ dto.setTransferStatus("1");
TransferApplyDto transferApply = transferApplyMapper.getTransferApply(dto);
transferApply.setTransferFileDtos(transferApplyMapper.getTransferFile(dto));
return transferApply;
diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml
index e367508..d51a98c 100644
--- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml
+++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml
@@ -426,6 +426,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CROSS JOIN da_ky_transfer_apply dkta
WHERE dkta.del_flag = '1'
AND dkta.id = #{id}
+
+ AND dkta.transfer_status = #{transferStatus}
+
AND dt.level = (SELECT MAX(level) FROM DeptTree)