diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOperateLog.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOperateLog.java
index 9e3f187d..9d7a9942 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOperateLog.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOperateLog.java
@@ -31,6 +31,7 @@ public class ProjectOperateLog extends BaseEntity
     /** 操作人员 */
     @Excel(name = "操作人员")
     private String operateUser;
+    private String operateUserName;
 
     /** 操作时间 */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
index 6c76468d..12153368 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
@@ -124,7 +124,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
         projectInfo.setUpdateTime(DateUtils.getNowDate());
         projectInfo.setCreateBy(ShiroUtils.getUserId().toString());
         if (CollUtil.isNotEmpty(projectInfo.getCompetitorList())) {
-            projectInfo.setCompetitor(CollUtil.join(projectInfo.getCompetitorList(), ","));
+            projectInfo.setCompetitor(projectInfo.getCompetitorList().stream().filter(StringUtils::isNotEmpty).collect(Collectors.joining(",")));
         }
         int i = projectInfoMapper.insertProjectInfo(projectInfo);
         saveOtherInfo(projectInfo);
@@ -297,15 +297,15 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
 
             if (oldProduct == null && newProduct != null) {
                 // 新增产品
-                logContent.append(index).append(".").append(type).append("新增：").append(newProduct.getProductCode()).append("\n");
+                logContent.append(index).append(".").append(type).append("新增：").append(newProduct.getProductBomCode()).append("\n");
                 index++;
             } else if (oldProduct != null && newProduct == null) {
                 // 删除产品
-                logContent.append(index).append(".").append(type).append("删除：").append(oldProduct.getProductCode()).append("\n");
+                logContent.append(index).append(".").append(type).append("删除：").append(oldProduct.getProductBomCode()).append("\n");
                 index++;
             } else if (oldProduct != null) {
                 // 变更产品
-                index = compareField(logContent, index, "产品编号", oldProduct.getProductCode(), newProduct.getProductCode());
+                index = compareField(logContent, index, "产品编号", oldProduct.getProductBomCode(), newProduct.getProductBomCode());
                 index = compareField(logContent, index, "数量", oldProduct.getQuantity(), newProduct.getQuantity());
                 index = compareField(logContent, index, "目录单价", oldProduct.getCataloguePrice(), newProduct.getCataloguePrice());
                 index = compareField(logContent, index, "指导折扣", oldProduct.getGuidanceDiscount(), newProduct.getGuidanceDiscount());
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOperateLogMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOperateLogMapper.xml
index b66cffa3..cb68cb76 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOperateLogMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOperateLogMapper.xml
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              , t1.operate_time
              , t1.project_id
              , t1.log_type
-             , t2.user_name
+             , t2.user_name as operate_user_name
         from project_operate_log t1
                  left join sys_user t2 on operate_user = t2.user_id
         where t1.project_id = #{projectId}