Merge branch 'sprint/zentaopms230'

2022-09-01 13:28:26 +08:00
parent 5bb9d5ea6d da43a0c083
commit e7d65e1dce
47 changed files with 1591 additions and 1099 deletions
@@ -2848,10 +2848,11 @@ class userModel extends model
        $personalData['createdDocs']   = $this->dao->select($count)->from(TABLE_DOC)->where('addedBy')->eq($account)->andWhere('lib')->in(array_keys($allLibs))->andWhere('deleted')->eq('0')->fetch('count');
        $personalData['finishedTasks'] = $this->dao->select($t1Count)->from(TABLE_TASK)->alias('t1')
            ->leftjoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
+            ->leftjoin(TABLE_TASKTEAM)->alias('t3')->on('t1.id = t3.task')
            ->where('t1.deleted')->eq('0')
            ->andWhere('t2.deleted')->eq('0')
            ->andWhere('t1.finishedBy', true)->eq($account)
-            ->orWhere('t1.finishedList')->like("%,{$account},%")
+            ->orWhere('t3.status')->eq("done")
            ->markRight(1)
            ->fetch('count');