diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java index c179b13..925834f 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java @@ -163,6 +163,8 @@ public class DaKyProFilesContentsDto { private String delFlag; private String keyWord; private String uploadTime; + private String proName; + private String singleProName; private List children = new ArrayList<>(); } 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 94684b2..1dd888c 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 @@ -94,10 +94,10 @@ public class TransferApplyServiceImpl implements TransferApplyService { @Override public AjaxResult audit(TransferApplyDto dto) { + dto.setAuditUser(getLoginUser().getUserId().toString()); + dto.setAuditUserName(getLoginUser().getUsername()); Integer i = transferApplyMapper.audit(dto); if (i > 0) { - dto.setAuditUser(getLoginUser().getUserId().toString()); - dto.setAuditUserName(getLoginUser().getUsername()); transferApplyMapper.addTransferAuditRecord(dto); AjaxResult.success("审核成功"); } diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 969a064..2dd63a8 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -267,6 +267,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" audit_opinion = #{auditOpinion}, + + audit_user = #{auditUserName}, + + audit_time = now() WHERE id = #{id}