cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentIssueRecycleServiceImpl.java
@@ -149,14 +149,35 @@
        if (ObjectUtils.isNotEmpty(manageDocumentIssueRecycle.getRecycleUser())){
            /*新增8.3的发放与回收记录*/
            ManageRecordIssueRecycle manageRecordIssueRecycle = manageRecordIssueRecycleMapper.selectOne(Wrappers.<ManageRecordIssueRecycle>lambdaQuery()
                    .eq(ManageRecordIssueRecycle::getDocumentCode, documentIssueRecycle.getDocumentCode())
                    .eq(ManageRecordIssueRecycle::getDocumentName, documentIssueRecycle.getName())
                    .eq(ManageRecordIssueRecycle::getDocumentVersion, documentIssueRecycle.getVersion())
                    .eq(ManageRecordIssueRecycle::getReceiveUser, documentIssueRecycle.getIssueUser())
                    .eq(ManageRecordIssueRecycle::getReceiveDate, documentIssueRecycle.getIssueDate()));
            manageRecordIssueRecycle.setSignedUser(manageDocumentIssueRecycle.getRecycleUser());
            manageRecordIssueRecycle.setSignedDate(manageDocumentIssueRecycle.getRecycleDate());
            manageRecordIssueRecycleMapper.updateById(manageRecordIssueRecycle);
                    .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getDocumentCode()), ManageRecordIssueRecycle::getDocumentCode, documentIssueRecycle.getDocumentCode())
                    .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getName()), ManageRecordIssueRecycle::getDocumentName, documentIssueRecycle.getName())
                    .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getVersion()), ManageRecordIssueRecycle::getDocumentVersion, documentIssueRecycle.getVersion())
                    .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getIssueUser()), ManageRecordIssueRecycle::getReceiveUser, documentIssueRecycle.getIssueUser())
                    .eq(ObjectUtils.isNotEmpty(documentIssueRecycle.getIssueDate()), ManageRecordIssueRecycle::getReceiveDate, documentIssueRecycle.getIssueDate())
                    .orderByDesc(ManageRecordIssueRecycle::getId)
                    .last("limit 1"));
            if (manageRecordIssueRecycle == null) {
                // 历史发放记录在台账里可能没有对应行,回收时补建,保证两个页面始终能对上
                manageRecordIssueRecycle = new ManageRecordIssueRecycle();
                manageRecordIssueRecycle.setDocumentCode(documentIssueRecycle.getDocumentCode());
                manageRecordIssueRecycle.setDocumentName(documentIssueRecycle.getName());
                manageRecordIssueRecycle.setDocumentVersion(documentIssueRecycle.getVersion());
                manageRecordIssueRecycle.setReceiveUser(documentIssueRecycle.getIssueUser());
                manageRecordIssueRecycle.setReceiveDate(documentIssueRecycle.getIssueDate());
                manageRecordIssueRecycle.setSignedUser(manageDocumentIssueRecycle.getRecycleUser());
                manageRecordIssueRecycle.setSignedDate(manageDocumentIssueRecycle.getRecycleDate());
                manageRecordIssueRecycleMapper.insert(manageRecordIssueRecycle);
            } else {
                // 发放信息跟着变更,回收信息回写签收人/签收日期
                manageRecordIssueRecycle.setDocumentCode(manageDocumentIssueRecycle.getDocumentCode());
                manageRecordIssueRecycle.setDocumentName(manageDocumentIssueRecycle.getName());
                manageRecordIssueRecycle.setDocumentVersion(manageDocumentIssueRecycle.getVersion());
                manageRecordIssueRecycle.setReceiveUser(manageDocumentIssueRecycle.getIssueUser());
                manageRecordIssueRecycle.setReceiveDate(manageDocumentIssueRecycle.getIssueDate());
                manageRecordIssueRecycle.setSignedUser(manageDocumentIssueRecycle.getRecycleUser());
                manageRecordIssueRecycle.setSignedDate(manageDocumentIssueRecycle.getRecycleDate());
                manageRecordIssueRecycleMapper.updateById(manageRecordIssueRecycle);
            }
        }
        if (ObjectUtils.isNotEmpty(manageDocumentIssueRecycle.getFile())) {
            if (ObjectUtils.isNotEmpty(documentIssueRecycle.getUrl())) {