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 { 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 wxSaveImg; + // 小程序端使用字段 + private List wxSaveImage; /** * 目测状态:0 异常 1 良好