From e68c8cd2ad07c2b7bb0d4a65bcd0d4b9ff8c4d3d Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Tue, 11 Nov 2025 22:16:12 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=B0=83?=
 =?UTF-8?q?=E4=BC=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/common/CommonController.java     | 1 +
 .../com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 595ceb889..f148b4c62 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -255,6 +255,7 @@ public class CommonController {
     @GetMapping("/html/content/{title}")
     public String getHtmlContent(@PathVariable("title") String title, HttpServletResponse response) {
         response.setHeader("X-Frame-Options", "ALLOWALL");
+        response.setHeader("Content-Security-Policy", "frame-ancestors *");
         return htmlService.getHtmlContent(title);
     }
 
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
index 03e04da53..c079e1ff6 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
@@ -377,14 +377,14 @@ public class StoreProductServiceImpl implements IStoreProductService {
             if (exitProdColorIdList.contains(updateProdColorId)) {
                 StoreProductColor existColor = existColorMap.get(updateProdColorNameList.get(i));
                 if (ObjectUtils.isNotEmpty(existColor)) {
-                    String shoeUpperLiningMaterial = updateColorLineMaterialMap.get(updateProdColorNameList.get(i));
                     // 修改颜色的内里属性
-                    existColor.setShoeUpperLiningMaterial(shoeUpperLiningMaterial);
+                    existColor.setShoeUpperLiningMaterial(updateColorLineMaterialMap.get(updateProdColorNameList.get(i)));
                 }
                 continue;
             }
             // 新增的商品颜色
             dbProdColorList.add(new StoreProductColor().setStoreColorId(updateProdColorId).setStoreProdId(storeProdId).setStoreId(storeId)
+                    .setShoeUpperLiningMaterial(updateColorLineMaterialMap.get(updateProdColorNameList.get(i)))
                     .setColorName(updateProdColorNameList.get(i)).setOrderNum(i + 1).setProdStatus(EProductStatus.ON_SALE.getValue()));
         }
         // 更新商品颜色或新增商品颜色