Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -217,10 +217,14 @@ class NewsLogic extends BaseLogic
      */
     public function getCategory($category){
         $str = '';
-        foreach ($category as $v){
-            $str .= $v.',';
-        }
-        return !empty(trim($str,',')) ? ','.$str.',' : '';
+        if(is_array($category) && $category){
+            $str = ','.implode(',',$category).',';
+        }
+        return $str;
+//        foreach ($category as $v){
+//            $str .= $v.',';
+//        }
+//        return !empty(trim($str,',')) ? ','.$str.',' : '';
     }
 
     /**

@@ -247,12 +247,16 @@ class CategoryLogic extends  BaseLogic
      */
     public function getLastCategory($category){
         $str = '';
-        if(isset($category) && !empty($category)){
-            foreach ($category as $v){
-                $str .= $v.',';
+        if(is_array($category) && $category){
+            $str = ','.implode(',',$category).',';
         }
-        }
-        return !empty(trim($str,',')) ? ','.$str.',' : '';
+        return $str;
+//        if(isset($category) && !empty($category)){
+//            foreach ($category as $v){
+//                $str .= $v.',';
+//            }
+//        }
+//        return !empty(trim($str,',')) ? ','.$str.',' : '';
     }
 
     /**