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

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