github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-10 18:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 移交项目和任务时记录被移交对象

Browse Source
This commit is contained in:
kuaifan 2022-04-27 16:00:55 +08:00
parent 7b757d68b4
commit 7b8a6c2a4c
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/ProjectTaskUser.php
View File

@ -46,7 +46,7 @@ class ProjectTaskUser extends AbstractModel
*/
public static function transfer($originalUserid, $newUserid)
{
self::whereUserid($originalUserid)->chunk(100, function ($list) use ($newUserid) {
self::whereUserid($originalUserid)->chunk(100, function ($list) use ($originalUserid, $newUserid) {
$tastIds = [];
/** @var self $item */
foreach ($list as $item) {
@ -62,7 +62,7 @@ class ProjectTaskUser extends AbstractModel
$item->save();
}
if ($item->projectTask) {
$item->projectTask->addLog("移交{任务}身份给", ['userid' => [$newUserid]]);
$item->projectTask->addLog("移交{任务}身份", ['userid' => [$originalUserid, ' => ',$newUserid]]);
if (!in_array($item->task_pid, $tastIds)) {
$tastIds[] = $item->task_pid;
$item->projectTask->syncDialogUser();

4
app/Models/ProjectUser.php
View File

@ -46,7 +46,7 @@ class ProjectUser extends AbstractModel
*/
public static function transfer($originalUserid, $newUserid)
{
self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($newUserid) {
self::whereUserid($originalUserid)->chunkById(100, function ($list) use ($originalUserid, $newUserid) {
/** @var self $item */
foreach ($list as $item) {
$row = self::whereProjectId($item->project_id)->whereUserid($newUserid)->first();
@ -61,7 +61,7 @@ class ProjectUser extends AbstractModel
$item->save();
}
if ($item->project) {
$item->project->addLog("移交项目身份给", ['userid' => $newUserid]);
$item->project->addLog("移交项目身份", ['userid' => [$originalUserid, ' => ',$newUserid]]);
$item->project->syncDialogUser();
}
}

16
resources/assets/js/pages/manage/components/ProjectLog.vue
View File

@ -184,12 +184,16 @@ export default {
let userids = $A.isArray(record.userid) ? record.userid : [record.userid]
let userNode = [];
userids.some(userid => {
userNode.push(h('UserAvatar', {
props: {
size: 18,
userid
}
}))
if (/\d+/.test(userid)) {
userNode.push(h('UserAvatar', {
props: {
size: 18,
userid
}
}))
} else {
userNode.push(h('span', userid))
}
})
if (userNode.length > 0) {
vNode.push(h('div', {