Merge branch 'zentaopms_281'

2023-02-08 15:31:13 +08:00
parent 5611c2c285 bc593460d0
commit c2724b9f57
31 changed files with 157 additions and 44 deletions
@@ -615,7 +615,9 @@ class programModel extends model
            ->andWhere('t1.openedBy', true)->eq($this->app->user->account)
            ->orWhere('t1.PM')->eq($this->app->user->account)
            ->orWhere('t2.account')->eq($this->app->user->account)
-            ->orWhere('t3.user')->eq($this->app->user->account)
+            ->orWhere('(t3.user')->eq($this->app->user->account)
+            ->andWhere('t3.deleted')->eq(0)
+            ->markRight(1)
            ->orWhere("CONCAT(',', t1.whitelist, ',')")->like("%,{$this->app->user->account},%")
            ->markRight(1)
            ->fi()