mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-29 11:24:02 +08:00
parent 68d4eae71c
commit 3404f9eb7a
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/adminapi/lists/finance/AccountLogLists.php
View File

@ -39,7 +39,7 @@ class AccountLogLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array
{
return [
'=' => ['al.change_type'],
'=' => ['change_type','company_id'],
];
}
@ -57,18 +57,13 @@ class AccountLogLists extends BaseAdminDataLists implements ListsSearchInterface
$where[] = ['change_type', 'in', AccountLogEnum::getUserMoneyChangeType()];
}
if (!empty($this->params['user_info'])) {
$where[] = ['u.sn|u.nickname|u.mobile', 'like', '%' . $this->params['user_info'] . '%'];
}
if (!empty($this->params['start_time'])) {
$where[] = ['al.create_time', '>=', strtotime($this->params['start_time'])];
$where[] = ['create_time', '>=', strtotime($this->params['start_time'])];
}
if (!empty($this->params['end_time'])) {
$where[] = ['al.create_time', '<=', strtotime($this->params['end_time'])];
$where[] = ['create_time', '<=', strtotime($this->params['end_time'])];
}
return $where;
}
@ -108,9 +103,7 @@ class AccountLogLists extends BaseAdminDataLists implements ListsSearchInterface
*/
public function count(): int
{
return UserAccountLog::alias('al')
->join('user u', 'u.id = al.user_id')
->where($this->queryWhere())
return UserAccountLog::where($this->queryWhere())
->where($this->searchWhere)
->count();
}

2
app/api/logic/IndexLogic.php
View File

@ -114,7 +114,7 @@ class IndexLogic extends BaseLogic
$group_find=UserRole::where('id',$group_id)->find();
$menu=[];
if($group_find){
$select=UserMenu::where('id','in',$group_find['menu_arr'])->field('id,pid,name,icon,sort,paths')->limit(100)->select()->toArray();
$select=UserMenu::where('id','in',$group_find['menu_arr'])->field('id,pid,name,icon,sort,paths')->order('sort','desc')->limit(100)->select()->toArray();
$arr=[];
foreach($select as $k=>$v){
if($v['pid']==0){