diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
index d8bfd7fa..6b660d57 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
@@ -127,6 +127,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
                             break;
                         }
                     }
+                } else {
+                    details.setNum(BigDecimal.ZERO);
                 }
                 // 为每个退料详情设置附件信息
                 setBmFileInfosForDetails(details, bmFileInfos);
@@ -350,6 +352,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
         }
         if (StringUtils.isBlank(dto.getBackApplyInfo().getCreateBy())) {
             dto.getBackApplyInfo().setCreateBy(createBy);
+        } else {
+            createBy = dto.getBackApplyInfo().getCreateBy();
         }
         //对传入的手机号进行校验
         if (StringUtils.isNotBlank(dto.getBackApplyInfo().getPhone()) && !PhoneUtil.isMobile(dto.getBackApplyInfo().getPhone())) {
@@ -475,7 +479,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
             // 判断是否为编码设备并处理附件
             Integer isBack = dto.getBackApplyInfo().getIsBack();
             details.setIsFinished(isBack);
-            result = saveMaCodeBmFileInfo(isBack, details, backApplyInfo.getId(), result);
+            result = saveMaCodeBmFileInfo(createBy, isBack, details, backApplyInfo.getId(), result);
             if (isBack == 1) {
                 // 更新任务表及退料申请表状态
                 result += updateTaskAndBackInfo(backApplyInfo);
@@ -541,9 +545,10 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
      * @param result
      * @return
      */
-    private int saveMaCodeBmFileInfo(Integer isBack, BackApplyDetails details, Long id, int result) {
+    private int saveMaCodeBmFileInfo(String createBy, Integer isBack, BackApplyDetails details, Long id, int result) {
         // 设置公共字段
         setCommonFields(details, id);
+        details.setCreateBy(createBy);
         if (CollectionUtils.isNotEmpty(details.getMaCodeList())) {
             for (MaCodeDto maCodeDto : details.getMaCodeList()) {
                 // 设置每个 MaCodeDto 的独立属性
@@ -601,6 +606,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
         String createBy = "";
         if (StringUtils.isBlank(dto.getBackApplyInfo().getCreateBy())) {
             dto.getBackApplyInfo().setCreateBy(createBy);
+        } else {
+            createBy = dto.getBackApplyInfo().getCreateBy();
         }
         //对提交的退料详情数量进行校验
         for (BackApplyDetails backApplyDetails : dto.getBackApplyDetailsList()) {
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index 531a4552..d268d4fe 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -286,6 +286,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
         String createBy = "";
         if (StringUtils.isBlank(leaseApplyRequestVo.getLeaseApplyInfo().getCreateBy())) {
             leaseApplyRequestVo.getLeaseApplyInfo().setCreateBy(createBy);
+        } else {
+            createBy = leaseApplyRequestVo.getLeaseApplyInfo().getCreateBy();
         }
         try {
             int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId());
@@ -322,7 +324,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             }
             TmTaskAgreement tmTaskAgreement = new TmTaskAgreement(tmTask.getTaskId(), leaseApplyRequestVo.getLeaseApplyInfo().getAgreementId());
             tmTaskAgreement.setCreateTime(DateUtils.getNowDate());
-            tmTaskAgreement.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            tmTaskAgreement.setCreateBy(createBy);
             tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement);
             leaseApplyRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId());
             leaseApplyRequestVo.getLeaseApplyInfo().setCode(taskCode);
@@ -337,12 +339,13 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             int count = leaseApplyInfoMapper.insertLeaseApplyInfo(leaseApplyRequestVo.getLeaseApplyInfo());
             if (!CollectionUtils.isEmpty(leaseApplyRequestVo.getLeaseApplyInfo().getBmFileInfos())) {
                 TmTask finalTmTask = tmTask;
+                String finalCreateBy = createBy;
                 leaseApplyRequestVo.getLeaseApplyInfo().getBmFileInfos().forEach(bmFileInfo -> {
                     bmFileInfo.setTaskType(2);
                     bmFileInfo.setTaskId(finalTmTask.getTaskId());
                     bmFileInfo.setModelId(leaseApplyRequestVo.getLeaseApplyInfo().getId());
                     bmFileInfo.setFileType(5L);
-                    bmFileInfo.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                    bmFileInfo.setCreateBy(finalCreateBy);
                     bmFileInfo.setCreateTime(DateUtils.getNowDate());
                     bmFileInfoMapper.insertBmFileInfo(bmFileInfo);
                 });
@@ -978,6 +981,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
             String createBy = "";
             if (StringUtils.isBlank(leaseApplyRequestVo.getLeaseApplyInfo().getCreateBy())) {
                 leaseApplyRequestVo.getLeaseApplyInfo().setCreateBy(createBy);
+            } else {
+                createBy  = leaseApplyRequestVo.getLeaseApplyInfo().getCreateBy();
             }
             // 提取到局部变量中，减少重复代码
             LeaseApplyInfo leaseApplyInfo = leaseApplyRequestVo.getLeaseApplyInfo();