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

@@ -152,8 +152,7 @@ class BaseController extends Controller
             } else {
             } else {
                 if (is_null($v)) {
                 if (is_null($v)) {
                     $data[$k] = '';
                     $data[$k] = '';
-                    continue;
-                }
+                }else{
                     switch ((string) $k) {
                     switch ((string) $k) {
                         case 'image':
                         case 'image':
                             $data['image_link'] = url('/a/image/' . $v);
                             $data['image_link'] = url('/a/image/' . $v);
@@ -161,6 +160,7 @@ class BaseController extends Controller
                     }
                     }
                 }
                 }
             }
             }
+        }
         return $data;
         return $data;
     }
     }