From c30b49f50a2ba9ac1dbad4acc9239cac8a99b36d Mon Sep 17 00:00:00 2001
From: OPGame <1242479791@qq.com>
Date: Thu, 5 Sep 2019 18:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E7=9A=84=E6=97=B6=E5=80=99=E8=BF=9B=E8=A1=8C=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yami/shop/admin/controller/SpecController.java     | 6 ++++--
 .../src/main/java/com/yami/shop/bean/model/ProdProp.java   | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java
index a1d0f8b..4b3371d 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java
@@ -39,6 +39,8 @@ import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.service.ProdPropService;
 import com.yami.shop.service.ProdPropValueService;
 
+import javax.validation.Valid;
+
 /**
  * 规格管理
  *
@@ -89,7 +91,7 @@ public class SpecController {
      */
     @PostMapping
     @PreAuthorize("@pms.hasPermission('prod:spec:save')")
-    public ResponseEntity<Void> save(@RequestBody ProdProp prodProp) {
+    public ResponseEntity<Void> save(@Valid @RequestBody ProdProp prodProp) {
         prodProp.setRule(ProdPropRule.SPEC.value());
         prodProp.setShopId(SecurityUtils.getSysUser().getShopId());
         prodPropService.saveProdPropAndValues(prodProp);
@@ -101,7 +103,7 @@ public class SpecController {
      */
     @PutMapping
     @PreAuthorize("@pms.hasPermission('prod:spec:update')")
-    public ResponseEntity<Void> update(@RequestBody ProdProp prodProp) {
+    public ResponseEntity<Void> update(@Valid @RequestBody ProdProp prodProp) {
         ProdProp dbProdProp = prodPropService.getById(prodProp.getPropId());
         if (!Objects.equals(dbProdProp.getShopId(), SecurityUtils.getSysUser().getShopId())) {
             throw new YamiShopBindException("没有权限获取该商品规格信息");
diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java
index ccd6c56..7e508c5 100644
--- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java
+++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java
@@ -16,6 +16,10 @@ import java.util.List;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
 @Data
 @TableName("tz_prod_prop")
 public class ProdProp implements Serializable {
@@ -30,7 +34,7 @@ public class ProdProp implements Serializable {
     /**
      * 属性名称
      */
-
+    @NotBlank(message = "属性名称不能为空")
     private String propName;
 
     /**
@@ -44,6 +48,7 @@ public class ProdProp implements Serializable {
      * 属性值
      */
     @TableField(exist=false)
+    @NotEmpty(message="规格属性值不能为空")
     private List<ProdPropValue> prodPropValues;
 
 }