Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bugs in dmdb.

Browse Source
This commit is contained in:
朱金勇
2023-04-13 05:10:17 +00:00
parent 40e2ae98d5
commit bb531cfd2c
7 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/model.php
+2 -2
View File
@@ -219,7 +219,7 @@ class blockModel extends model
->orWhere('t3.status')->ne('suspended')
->markRight(1)
->andWhere('t1.status')->in('wait,doing')
->andWhere('t1.deadline')->ne('0000-00-00')
->andWhere('t1.deadline')->notZeroDate()
->andWhere('t1.deadline')->lt($today)
->andWhere('t1.deleted')->eq(0)
->andWhere('t3.deleted')->eq(0)
@@ -228,7 +228,7 @@ class blockModel extends model
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
->where('t1.assignedTo')->eq($this->app->user->account)
->andWhere('t1.status')->eq('active')
->andWhere('t1.deadline')->ne('0000-00-00')
->andWhere('t1.deadline')->notZeroDate()
->andWhere('t1.deadline')->lt($today)
->andWhere('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)