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

no message

Browse Source
This commit is contained in:
kuaifan
2022-11-21 14:00:19 +08:00
parent 542e3b9a49
commit 66c8a4db23
8 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/DialogController.php
View File

@@ -503,7 +503,7 @@ class DialogController extends AbstractController
$user = User::auth();
//
$id = Request::input('id');
$ids = Base::arrayRetainInt(is_array($id) ? $id : Base::explodeInt($id));
$ids = Base::explodeInt($id);
//
WebSocketDialogMsg::whereIn('id', $ids)->chunkById(20, function($list) use ($user) {
/** @var WebSocketDialogMsg $item */

2
app/Http/Controllers/Api/ReportController.php
View File

@@ -497,7 +497,7 @@ class ReportController extends AbstractController
}
if (is_string($ids)) {
$ids = explode(",", $ids);
$ids = Base::explodeInt($ids);
}
$data = Report::with(["receivesUser" => function (BelongsToMany $query) use ($user) {

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

@@ -214,6 +214,7 @@ class UsersController extends AbstractController
{
"userid": 1,
"identity": [ ],
"department": [ ],
"az": "",
"email": "admin@admin.com",
"nickname": "admin",
@@ -234,6 +235,7 @@ class UsersController extends AbstractController
//
$data = $user->toArray();
$data['nickname_original'] = $user->getRawOriginal('nickname');
$data['department_name'] = $user->getDepartmentName();
return Base::retSuccess('success', $data);
}
@@ -638,6 +640,9 @@ class UsersController extends AbstractController
if (!is_array($data['department'])) {
$data['department'] = [];
}
if (count($data['department']) > 10) {
return Base::retError('最多只可加入10个部门');
}
foreach ($data['department'] as $id) {
if (!UserDepartment::whereId($id)->exists()) {
return Base::retError('修改部门不存在');
@@ -791,7 +796,7 @@ class UsersController extends AbstractController
*
* @apiSuccess {Number} ret 返回状态码（1正确、0错误）
* @apiSuccess {String} msg 返回信息（错误描述）
* @apiSuccess {Object} data 返回数据（同"获取我的信息"接口）
* @apiSuccess {Object} data 返回数据
*/
public function email__verification()
{
@@ -839,7 +844,7 @@ class UsersController extends AbstractController
*
* @apiSuccess {Number} ret 返回状态码（1正确、0错误）
* @apiSuccess {String} msg 返回信息（错误描述）
* @apiSuccess {Object} data 返回数据（同"获取我的信息"接口）
* @apiSuccess {Object} data 返回数据
*/
public function umeng__alias()
{