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

web/admin/www/keyword.html

@@ -161,6 +161,7 @@
             if (btn == 'edit') edit(id);
         }
 
+
         function getdata(id, act, cb) {
             cb({ data: id == 0 ? {} : table.data[id] });
         }

web/admin/www/keyword.php

@@ -19,6 +19,7 @@ class keyword
             } else {
                 $csql->where('cateid=0');
             }
+            
         } else
             $csql->where('cateid', get('_cateid'));
         $csql->where('name like', objstr($query, 'name'));
@@ -69,6 +70,7 @@ class keyword
         }
         return succjson($ret);
     }
+
     public static function json_update()
     {
         global $db;