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

This commit is contained in:
tanghucheng
2022-08-05 13:07:31 +08:00
79 changed files with 1078 additions and 260 deletions
+1
View File
@@ -1,3 +1,4 @@
.future {display: inline-block;}
.c-number {overflow: hidden; text-align: right !important; text-overflow: ellipsis; white-space: nowrap;}
.text-remind {color: #ffa34d;}
td.delayed {color: #fff; background: #e84e0f !important;}
+2 -2
View File
@@ -192,7 +192,7 @@ class projectModel extends model
$project = $this->dao->select('*')->from(TABLE_PROJECT)
->where('id')->eq($projectID)
->beginIF($this->config->system == 'new')->andWhere('`type`')->in($type)->fi()
->beginIF($this->config->systemMode == 'new')->andWhere('`type`')->in($type)->fi()
->fetch();
if(!$project) return false;
@@ -437,7 +437,7 @@ class projectModel extends model
$progressList[$projectID] = $progress;
}
return is_numeric($projectIDList) ? $progressList[$projectIDList] : $progressList;
return is_numeric($projectIDList) ? (empty($progressList) ? 0 : $progressList[$projectIDList]) : $progressList;
}
/**