Merge branch 'master' of http://git.dever.cc:3000/dever-package/manage

database/admin.php

@@ -176,6 +176,7 @@ return array
 				'api' => 'passport/user-all',//接口地址，最好是获取多条数据的地址
 				'col' => 'name',//要查询的字段
 				'result' => 'id',//返回的字段
+				'search' => 'uid',//本表的字段，默认为当前的字段
 			),
 			* 就是将本字段email当做passport/user-one的name字段来查找id
 			*/

src/Database.php

@@ -1454,15 +1454,23 @@ class Database
                                     }
                                     $v = $t;
                                 }
-                                
-                                $param['option'][$k] = array('yes', 'in');
+                                if (isset($config['manage']['search']['api'][$k]['search'])) {
+                                    $param['option'][$config['manage']['search']['api'][$k]['search']] = array('yes', 'in');
+                                } else {
+                                    $param['option'][$k] = array('yes', 'in');
+                                }
                             }
                         } else {
                             $v = '-100';
                         }
                     }
 
-                    $param['option_' . $k] = $v;
+                    if (isset($config['manage']['search']['api'][$k]['search'])) {
+                        $param['option_' . $config['manage']['search']['api'][$k]['search']] = $v;
+                    } else {
+                        $param['option_' . $k] = $v;
+                    }
+                    
                 }
             }
         }