diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
index 785dbebee..6b0680ab8 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
@@ -158,13 +158,15 @@ public class FirstOrderServiceImp implements FirstOrderService {
                 } else {
                     order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus());
                 }
-                if (Objects.nonNull(shopInfo.getSupervisorUserId())){
-                    EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
-                    order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
-                }
             } catch (Exception e) {
                 log.error("获取鲜丰订货金异常", e);
             }
+        }else {
+            order = new FirstOrderDTO();
+            if (Objects.nonNull(shopInfo.getSupervisorUserId())){
+                EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId());
+                order.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber());
+            }
         }
         return order;
     }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
index eabcedfef..4e307ed60 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
@@ -159,8 +159,10 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
             return leaseBaseInfoDO;
         }
         List<EnterpriseUserDO> userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds);
-        String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.joining(CommonConstants.COMMA));
-        leaseBaseInfoDO.setStoreManager(nameList);
+        if (CollectionUtils.isNotEmpty(userInfoByUserIds)){
+            String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.joining(CommonConstants.COMMA));
+            leaseBaseInfoDO.setStoreManager(nameList);
+        }
         return leaseBaseInfoDO;
     }