Merge branch 'lyz_cart' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

application/models/Business/Goods/GoodsClassService.php

@@ -335,17 +335,21 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
                     if(isset($treeGcIds[$secondGcId][\Our\ApiConst::zero])&&$newPlatThirdGcList){
                         foreach($treeGcIds[$secondGcId][\Our\ApiConst::zero] as $tempPaltThirdGcId){
                             $tempPlatClass = $newPlatThirdGcList[$tempPaltThirdGcId];
+                            if($tempPlatClass){
                                 $tempPlatClass['storeFlag'] = \Our\ApiConst::zero;
                                 $childrenClasses[] = $tempPlatClass;
                             }
                         }
+                    }
                     if(isset($treeGcIds[$secondGcId][\Our\ApiConst::one])&&$storeThirdGcList){
                         foreach($treeGcIds[$secondGcId][\Our\ApiConst::one] as $tempStoreThirdGcId){
                             $tempStoreClass = $storeThirdGcList[$tempStoreThirdGcId] ;
+                            if($tempStoreClass){
                                 $tempStoreClass['storeFlag'] = \Our\ApiConst::one;
                                 $childrenClasses[] = $tempStoreClass;
                             }
                         }
+                    }
                     $returnTemp['childClasses'] = $childrenClasses;
                     $classes[] = $returnTemp;
                 }