diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java
index b4d84b38..fad0994e 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java
@@ -92,7 +92,9 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog
                 throw new RuntimeException(e);
             }
         }
-
+        if(modifyLogs.isEmpty()){
+            return -1;
+        }
         // 批量插入保存
         return commodityCodeModifyLogDao.batchInsert(modifyLogs);
     }
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
index c6b006e7..a532f238 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
@@ -118,9 +118,11 @@ public class CommodityServiceImpl implements CommodityService {
             }
             // 记录修改记录
             Long userId = userInfoService.getUser().getUserId();
-            commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId);
+            int i = commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId);
+            if(i != -1){
+                i = commodityMapper.updateCommodity(codeEntity, shList);
+            }
 
-            int i = commodityMapper.updateCommodity(codeEntity, shList);
             flag = i >= 0;
         } else {
 
@@ -652,8 +654,8 @@ public class CommodityServiceImpl implements CommodityService {
     /**
      * 数据转换
      *
-     * @param orderItemInfo
-     * @param xhfMc
+     * @param
+     * @param
      * @param taxClassCodeEntity
      * @return
      */