mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 19:35:50 +00:00
perf: 优化聊天发送会员、任务、文件支持搜索ID
This commit is contained in:
parent
46dd449b2f
commit
44baa743c0
@ -134,8 +134,12 @@ class FileController extends AbstractController
|
|||||||
$builder->where("id", $id);
|
$builder->where("id", $id);
|
||||||
}
|
}
|
||||||
if ($key) {
|
if ($key) {
|
||||||
|
if (!$id && Base::isNumber($key)) {
|
||||||
|
$builder->where("id", $key);
|
||||||
|
} else {
|
||||||
$builder->where("name", "like", "%{$key}%");
|
$builder->where("name", "like", "%{$key}%");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$array = $builder->take($take)->get()->toArray();
|
$array = $builder->take($take)->get()->toArray();
|
||||||
// 搜索共享的
|
// 搜索共享的
|
||||||
$take = $take - count($array);
|
$take = $take - count($array);
|
||||||
|
|||||||
@ -494,7 +494,7 @@ class UsersController extends AbstractController
|
|||||||
* @apiName searchinfo
|
* @apiName searchinfo
|
||||||
*
|
*
|
||||||
* @apiParam {Object} keys 搜索条件
|
* @apiParam {Object} keys 搜索条件
|
||||||
* - keys.key 昵称、拼音、邮箱关键字
|
* - keys.key 会员ID、昵称、拼音、邮箱关键字
|
||||||
* - keys.disable 0-排除离职(默认),1-仅离职,2-含离职
|
* - keys.disable 0-排除离职(默认),1-仅离职,2-含离职
|
||||||
* - keys.bot 0-排除机器人(默认),1-仅机器人,2-含机器人
|
* - keys.bot 0-排除机器人(默认),1-仅机器人,2-含机器人
|
||||||
* - keys.project_id 在指定项目ID
|
* - keys.project_id 在指定项目ID
|
||||||
@ -534,6 +534,8 @@ class UsersController extends AbstractController
|
|||||||
if ($keys['key']) {
|
if ($keys['key']) {
|
||||||
if (str_contains($keys['key'], "@")) {
|
if (str_contains($keys['key'], "@")) {
|
||||||
$builder->where("email", "like", "%{$keys['key']}%");
|
$builder->where("email", "like", "%{$keys['key']}%");
|
||||||
|
} elseif (Base::isNumber($keys['key'])) {
|
||||||
|
$builder->where("userid", intval($keys['key']));
|
||||||
} else {
|
} else {
|
||||||
$builder->where(function($query) use ($keys) {
|
$builder->where(function($query) use ($keys) {
|
||||||
$query->where("nickname", "like", "%{$keys['key']}%")
|
$query->where("nickname", "like", "%{$keys['key']}%")
|
||||||
|
|||||||
@ -1179,7 +1179,12 @@ export default {
|
|||||||
array.some(item => {
|
array.some(item => {
|
||||||
let list = item.list;
|
let list = item.list;
|
||||||
if (searchTerm) {
|
if (searchTerm) {
|
||||||
list = list.filter(({value, key}) => $A.strExists(key || value, searchTerm));
|
list = list.filter(({id, value, key}) => {
|
||||||
|
if (/^\d+$/.test(searchTerm) && id && id == searchTerm) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return $A.strExists(key || value, searchTerm)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (list.length > 0) {
|
if (list.length > 0) {
|
||||||
item.label && values.push(...item.label)
|
item.label && values.push(...item.label)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user