Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport

2022-07-27 14:50:21 +08:00
parent 8f061e3e24 69ee2ea498
commit 46a8117b2d
61 changed files with 1311 additions and 1205 deletions
@@ -1691,6 +1691,7 @@ class bugModel extends model
        return $this->dao->select('t1.*,t2.name as productName')->from(TABLE_BUG)->alias('t1')
            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
            ->where('t1.deleted')->eq(0)
+            ->andWhere('t2.deleted')->eq('0')
            ->beginIF($type == 'bySearch')->andWhere($query)->fi()
            ->beginIF($executionID)->andWhere('t1.execution')->eq($executionID)->fi()
            ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi()