github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-16 03:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

build

Browse Source
This commit is contained in:
kuaifan 2022-11-20 19:53:20 +08:00
parent bbd19045bc
commit 542e3b9a49
13 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/User.php
View File

@ -478,7 +478,12 @@ class User extends AbstractModel
$userInfo = self::whereUserid($userid)->select(User::$basicField)->first();
if ($userInfo) {
$userInfo->online = $userInfo->getOnlineStatus();
$userInfo->department_name = $userInfo->department ? UserDepartment::whereIn('id', $userInfo->department)->pluck('name')->implode(',') : '';
$departments = [];
$list = UserDepartment::select(['id', 'owner_userid', 'name'])->whereIn('id', $userInfo->department)->get();
foreach ($list as $item) {
$departments[] = $item->name . ($item->owner_userid === $userid ? '(M)' : '');
}
$userInfo->department_name = implode(', ', $departments);
}
return $_A["__static_userid2basic_" . $userid] = ($userInfo ?: []);
}

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.20.90",
"version": "0.20.95",
"description": "DooTask is task management system.",
"scripts": {
"start": "./cmd dev",

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/build/226.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/build/38.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

0
public/js/build/471.js.LICENSE.txt → public/js/build/38.js.LICENSE.txt
View File

2
public/js/build/382.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/build/471.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/build/481.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/hash
View File

@ -1 +1 @@
ab9cc0a47f4df387
5d3e264b536c8959

7
public/mix-manifest.json
View File

@ -770,14 +770,14 @@
"/js/build/256.js": "/js/build/256.js",
"/js/build/27.js": "/js/build/27.js",
"/js/build/298.js": "/js/build/298.js",
"/js/build/38.js": "/js/build/38.js",
"/js/build/38.js.LICENSE.txt": "/js/build/38.js.LICENSE.txt",
"/js/build/382.js": "/js/build/382.js",
"/js/build/382.js.LICENSE.txt": "/js/build/382.js.LICENSE.txt",
"/js/build/395.js": "/js/build/395.js",
"/js/build/415.js": "/js/build/415.js",
"/js/build/425.js": "/js/build/425.js",
"/js/build/425.js.LICENSE.txt": "/js/build/425.js.LICENSE.txt",
"/js/build/471.js": "/js/build/471.js",
"/js/build/471.js.LICENSE.txt": "/js/build/471.js.LICENSE.txt",
"/js/build/479.js": "/js/build/479.js",
"/js/build/481.js": "/js/build/481.js",
"/js/build/481.js.LICENSE.txt": "/js/build/481.js.LICENSE.txt",
@ -1451,6 +1451,8 @@
"/uploads/file/drawio/202209/12/28e31814da4091d00405c291d25c8d7d": "/uploads/file/drawio/202209/12/28e31814da4091d00405c291d25c8d7d",
"/uploads/file/drawio/202210/12/28e31814da4091d00405c291d25c8d7d": "/uploads/file/drawio/202210/12/28e31814da4091d00405c291d25c8d7d",
"/uploads/file/drawio/202211/12/28e31814da4091d00405c291d25c8d7d": "/uploads/file/drawio/202211/12/28e31814da4091d00405c291d25c8d7d",
"/uploads/file/excel/202211/18/76452ae95c2209593f6ddaf5b6c09b18.xlsx": "/uploads/file/excel/202211/18/76452ae95c2209593f6ddaf5b6c09b18.xlsx",
"/uploads/file/excel/202211/18/xlsx-18-1668935215": "/uploads/file/excel/202211/18/xlsx-18-1668935215",
"/uploads/file/mind/202202/6/8abe2852fd70d43f1a793404546035c8": "/uploads/file/mind/202202/6/8abe2852fd70d43f1a793404546035c8",
"/uploads/file/mind/202203/6/8abe2852fd70d43f1a793404546035c8": "/uploads/file/mind/202203/6/8abe2852fd70d43f1a793404546035c8",
"/uploads/file/mind/202204/6/16388004eaf147a2e302cd90f5bc0529": "/uploads/file/mind/202204/6/16388004eaf147a2e302cd90f5bc0529",
@ -1525,6 +1527,7 @@
"/uploads/file/txt/202204/808/bcbe3365e6ac95ea2c0343a2395834dd.txt": "/uploads/file/txt/202204/808/bcbe3365e6ac95ea2c0343a2395834dd.txt",
"/uploads/file/txt/202204/808/d852e9b2dd6a2f20ed9247ea3f795a41": "/uploads/file/txt/202204/808/d852e9b2dd6a2f20ed9247ea3f795a41",
"/uploads/file/word/202204/800/01d7b778850ab3f27f92c2358842fed1.docx": "/uploads/file/word/202204/800/01d7b778850ab3f27f92c2358842fed1.docx",
"/uploads/file/word/202211/15/docx-15-1668033434": "/uploads/file/word/202211/15/docx-15-1668033434",
"/uploads/task/content/202203/10/62775702d689fc832783d5f959710de2": "/uploads/task/content/202203/10/62775702d689fc832783d5f959710de2",
"/uploads/task/content/202203/1000/4dc40dd205ccd9fa6abf3bf7ad87c332": "/uploads/task/content/202203/1000/4dc40dd205ccd9fa6abf3bf7ad87c332",
"/uploads/task/content/202203/1000/attached/75b89de702e5b90cf9d82d639a0ac31f.png": "/uploads/task/content/202203/1000/attached/75b89de702e5b90cf9d82d639a0ac31f.png",

2
resources/mobile

@ -1 +1 @@
Subproject commit b9f1d0ea5a64c5063133f136176dd55b0ad02607
Subproject commit 457bacc7fc2ef7b0c50dffb083f02e620ca87e9a