Merge branch 'master' of https://git.ciy.cn/LiuZhengYu/ciyon_ai

web/admin/www/keywordManage.php

@@ -476,7 +476,7 @@ class keywordManage
                     }
                 }
             }
-        } else {
+        } else if((empty($arr3)||empty($arr1)) && !empty($arr2)){
             foreach ($arr2 as $b) {
                 $keywords[] = $b;
             }