From 714bbb83efe3f79806f28f35eb41c6f2a8fc0afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E5=8D=8E=E8=A7=9E?= <2840315406@qq.com>
Date: Fri, 25 Jul 2025 10:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E6=A0=B7=E7=AE=A1=E7=90=86=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E7=9A=84wxSaveIma?=
 =?UTF-8?q?ge=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fdsafe/wxapp/school/WxAppFoodSampleController.java    | 8 ++++----
 .../fdsafe/service/impl/FoodSampleServiceImpl.java        | 1 +
 .../java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java  | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java
index 3f48036..b64f4ec 100644
--- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java
+++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/wxapp/school/WxAppFoodSampleController.java
@@ -49,14 +49,14 @@ public class WxAppFoodSampleController extends BaseController {
             return AjaxResult.error("非学校人员账号无法操作");
         }
         // 图片校验小程序与app使用图片字段不一样,不能同时为空
-        if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImg()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){
+        if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImage()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){
             return error("留样照片不能为空");
         }
         foodSampleVO.setSchoolId(userVO.getSchoolId());
         // 图片处理
         String[] images = foodSampleVO.getSaveImg();
         if(images == null){
-            foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImg()));
+            foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage()));
         }
         return foodSampleService.saveVO(foodSampleVO);
     }
@@ -68,14 +68,14 @@ public class WxAppFoodSampleController extends BaseController {
             return AjaxResult.error("非学校人员账号无法操作");
         }
         // 图片校验小程序与app使用图片字段不一样,不能同时为空
-        if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImg()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){
+        if(CollectionUtils.isEmpty(foodSampleVO.getWxSaveImage()) && (foodSampleVO.getSaveImg() == null || foodSampleVO.getSaveImg().length == 0)){
             return error("留样照片不能为空");
         }
         foodSampleVO.setSchoolId(userVO.getSchoolId());
         // 图片处理
         String[] images = foodSampleVO.getSaveImg();
         if(images == null){
-            foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImg()));
+            foodSampleVO.setSaveImg(ArrayStringUtils.wxImgToArray(foodSampleVO.getWxSaveImage()));
         }
         return foodSampleService.updateVO(foodSampleVO);
     }
diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java
index 3f20588..deaec83 100644
--- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java
+++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodSampleServiceImpl.java
@@ -39,6 +39,7 @@ public class FoodSampleServiceImpl extends ServiceImpl<FoodSampleMapper, FoodSam
             list.forEach(item -> {
                 item.setSaveImg(ArrayStringUtils.stringToArray(item.getSaveImgStr()));
                 item.setWxSaveImg(ArrayStringUtils.arrayToWxImgList(item.getSaveImg()));
+                item.setWxSaveImage(ArrayStringUtils.arrayToWxImgList(item.getSaveImg()));
                 // FoodBookVO foodBookVO = this.getFoodBookVOById(item.getBookId());
                 // if(foodBookVO != null){
                 //     item.setDishNames(foodBookVO.getDishNames());
diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java
index 222443d..8c2ca82 100644
--- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java
+++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/FoodSampleVO.java
@@ -75,7 +75,10 @@ public class FoodSampleVO extends CommonVO implements Serializable {
     private String[] saveImg;
     private String saveImgStr;
     // @NotEmpty(message = "留样照片不能为空", groups = {WxUpdateGroup.class, WxAddGroup.class})
+    // web端使用字段
     private List<WxImg> wxSaveImg;
+    // 小程序端使用字段
+    private List<WxImg> wxSaveImage;
 
     /**
      * 目测状态:0 异常 1 良好