Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 1 新增用户审批状态接口 2 新增审批用户查询条件

Browse Source
This commit is contained in:
ganzizi
2023-09-08 19:14:31 +08:00
parent 0e9c1c19ce
commit 39a0d001ef
5 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/ApproveController.php
View File

@@ -360,6 +360,7 @@ class ApproveController extends AbstractController
{
$user = User::auth();
$data['userid'] = (string)$user->userid;
$data['username'] = Request::input('username');
$data['procName'] = Request::input('proc_def_name');
$data['sort'] = Request::input('sort');
$data['pageIndex'] = intval(Request::input('page'));
@@ -402,6 +403,7 @@ class ApproveController extends AbstractController
{
$user = User::auth();
$data['userid'] = (string)$user->userid;
$data['username'] = Request::input('username');
$data['procName'] = Request::input('proc_def_name'); //分类
$data['state'] = intval(Request::input('state')); //状态
$data['pageIndex'] = intval(Request::input('page'));
@@ -561,6 +563,7 @@ class ApproveController extends AbstractController
{
$user = User::auth();
$data['userid'] = (string)$user->userid;
$data['username'] = Request::input('username');
$data['procName'] = Request::input('proc_def_name');
$data['sort'] = Request::input('sort');
$data['pageIndex'] = intval(Request::input('page'));
@@ -641,6 +644,7 @@ class ApproveController extends AbstractController
{
$user = User::auth();
$data['userid'] = (string)$user->userid;
$data['username'] = Request::input('username');
$data['procName'] = Request::input('proc_def_name');
$data['sort'] = Request::input('sort');
$data['pageIndex'] = intval(Request::input('page'));

6
app/Http/Controllers/Api/UsersController.php
View File

@@ -633,6 +633,12 @@ class UsersController extends AbstractController
$basic = UserDelete::userid2basic($id);
}
if ($basic) {
// 用户审批状态
$approval_status = Base::getUserApprovalStatus($basic->userid);
if ($approval_status != ''){
$basic->approval_status = $approval_status;
}
//
$retArray[] = $basic;
}
}