diff --git a/application/admin/controller/setting/SystemGroupData.php b/application/admin/controller/setting/SystemGroupData.php
index ed319378..f8f93628 100644
--- a/application/admin/controller/setting/SystemGroupData.php
+++ b/application/admin/controller/setting/SystemGroupData.php
@@ -109,7 +109,8 @@ class SystemGroupData extends AuthController
         foreach ($params as $key => $param) {
             foreach ($Fields['fields'] as $index => $field) {
                 if($key == $field["title"]){
-                    if($param == "" || count($param) == 0)
+//                    if($param == "" || count($param) == 0)
+                    if($param == "")
                         return Json::fail($field["name"]."不能为空！");
                     else{
                         $value[$key]["type"] = $field["type"];
diff --git a/application/wap/model/store/StoreCart.php b/application/wap/model/store/StoreCart.php
index 2cb52f6c..6cc90684 100644
--- a/application/wap/model/store/StoreCart.php
+++ b/application/wap/model/store/StoreCart.php
@@ -99,14 +99,15 @@ class StoreCart extends ModelBasic
         foreach ($list as $k=>$cart) {
             if ($cart['seckill_id']) {
                 $product = StoreSeckill::field($seckillInfoField)
-                    ->find($cart['seckill_id'])->toArray();
+                    ->find($cart['seckill_id']);
             }elseif($cart['bargain_id']){
                 $product = StoreBargain::field($bargainInfoField)
-                    ->find($cart['bargain_id'])->toArray();
+                    ->find($cart['bargain_id']);
             }else{
                 $product = StoreProduct::field($productInfoField)
-                    ->find($cart['product_id'])->toArray();
+                    ->find($cart['product_id']);
             }
+            if(!empty($product)) $product = $product->toArray();
             $cart['productInfo'] = $product;
             //商品不存在
             if (!$product) {