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

调整接口返回

Browse Source
This commit is contained in:
luofei 2023-07-21 11:23:39 +08:00
parent 7155cc3c69
commit 11e46d81e9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/controller/CompanyController.php
View File

@ -257,7 +257,7 @@ class CompanyController extends BaseAdminController
$existUsers = Company::where('status', '<>', -1)->column('admin_id'); $existUsers = Company::where('status', '<>', -1)->column('admin_id');
$existUsers = array_unique($existUsers); $existUsers = array_unique($existUsers);
$users = Admin::whereNotIn('id', $existUsers)->field('id,name,avatar')->select()->toArray(); $users = Admin::whereNotIn('id', $existUsers)->field('id,name,avatar')->select()->toArray();
return $this->success('success', $users, 1, 1); return $this->success('success', $users);
} }
/** /**
@ -272,7 +272,7 @@ class CompanyController extends BaseAdminController
{ {
$company = Company::findOrEmpty($company_id); $company = Company::findOrEmpty($company_id);
$result = loopGetChild(Company::class, $company->id, 'level_one'); $result = loopGetChild(Company::class, $company->id, 'level_one');
return $this->success('success', $result, 1, 1); return $this->success('success', $result);
} }
} }

8
app/adminapi/controller/TaskController.php
View File

@ -87,7 +87,7 @@ class TaskController extends BaseAdminController
} }
unset($param['name'], $param['real_val']); unset($param['name'], $param['real_val']);
} }
return to_assign(200, '发布成功'); return to_assign(200, '发布成功', 1, 1);
} else { } else {
$param['create_time'] = time(); $param['create_time'] = time();
$param['admin_id'] = $this->adminId; $param['admin_id'] = $this->adminId;
@ -104,7 +104,7 @@ class TaskController extends BaseAdminController
} }
$param['initial_end_time'] = $param['end_time']; $param['initial_end_time'] = $param['end_time'];
$sid = Task::strict(false)->field(true)->insertGetId($param); $sid = Task::strict(false)->field(true)->insertGetId($param);
return to_assign(200, '发布成功'); return to_assign(200, '发布成功', 1, 1);
} }
} }
@ -214,9 +214,9 @@ class TaskController extends BaseAdminController
); );
Db::name('Log')->strict(false)->field(true)->insert($log_data); Db::name('Log')->strict(false)->field(true)->insert($log_data);
} }
return to_assign(200, '驳回成功'); return to_assign(200, '驳回成功', 1, 1);
} else { } else {
return to_assign(200, '驳回失败'); return to_assign(200, '驳回失败', 1, 1);
} }
} }

4
app/api/controller/ContractController.php
View File

@ -30,7 +30,7 @@ class ContractController extends BaseApiController
} }
$count = $query->count(); $count = $query->count();
$contract = $query->page($page)->limit($limit)->select(); $contract = $query->page($page)->limit($limit)->select();
return $this->success('success', ['count' => $count, 'data' => $contract], 1, 1); return $this->success('success', ['count' => $count, 'data' => $contract]);
} }
public function view($id) public function view($id)
@ -57,7 +57,7 @@ class ContractController extends BaseApiController
$user['qualification'] =$user['qualification']!=null?json_decode($user['qualification'], true):[]; $user['qualification'] =$user['qualification']!=null?json_decode($user['qualification'], true):[];
unset($user['role_id'], $user['dept_id'], $user['jobs_id'], $user['id']); unset($user['role_id'], $user['dept_id'], $user['jobs_id'], $user['id']);
} }
return $this->success('success', ['contract' => $contract, 'company' => $company, 'users' => $users], 1, 1); return $this->success('success', ['contract' => $contract, 'company' => $company, 'users' => $users]);
} }
} }