222

@@ -135,15 +135,12 @@ class Index extends Api
     public function LogoClassList()
     {
         $param = $this->request->param();
-        if (strstr($param['isclass'], ',function')) {
-            $param['isclass'] = substr($param['isclass'], 0, strpos($param['isclass'], ',function'));
-        }
-        if (strstr($param['logo'], ',function')) {
-            $param['logo'] = substr($param['logo'], 0, strpos($param['logo'], ',function'));
-        }
         if (empty($param['isclass'])) {
             $map = [];
             $map1 = [];
+            if (strstr($param['isclass'], ',function')) {
+                $param['isclass'] = substr($param['isclass'], 0, strpos($param['isclass'], ',function'));
+            }
             if (strstr($param['logo'], ',')) {
                 if (strstr($param['logo'], '0,')) {
                     $count = strpos($param['logo'], "0,");
@@ -174,6 +171,9 @@ class Index extends Api
         } else {
             $map = [];
             $map1 = [];
+            if (strstr($param['logo'], ',function')) {
+                $param['logo'] = substr($param['logo'], 0, strpos($param['logo'], ',function'));
+            }
             if (strstr($param['logo'], ',')) {
                 if (strstr($param['logo'], '0,')) {
                     $count = strpos($param['logo'], "0,");
@@ -262,15 +262,12 @@ class Index extends Api
     public function ProductClassList()
     {
         $param = $this->request->param();
-        if (strstr($param['isclass'], ',function')) {
-            $param['isclass'] = substr($param['isclass'], 0, strpos($param['isclass'], ',function'));
-        }
-        if (strstr($param['class_con'], ',function')) {
-            $param['class_con'] = substr($param['class_con'], 0, strpos($param['class_con'], ',function'));
-        }
         if (empty($param['class_con'])) {
             $map = [];
             $map1 = [];
+            if (strstr($param['isclass'], ',function')) {
+                $param['isclass'] = substr($param['isclass'], 0, strpos($param['isclass'], ',function'));
+            }
             if (strstr($param['isclass'], ',')) {
                 if (strstr($param['isclass'], '0,')) {
                     $count = strpos($param['isclass'], "0,");
@@ -301,6 +298,9 @@ class Index extends Api
         } else {
             $map = [];
             $map1 = [];
+            if (strstr($param['class_con'], ',function')) {
+                $param['class_con'] = substr($param['class_con'], 0, strpos($param['class_con'], ',function'));
+            }
             if (strstr($param['isclass'], ',')) {
                 if (strstr($param['isclass'], '0,')) {
                     $count = strpos($param['isclass'], "0,");