|
@@ -136,10 +136,10 @@ class Integral extends EnterpriseController {
|
|
|
}
|
|
|
|
|
|
$whrCommonFt = [];
|
|
|
- $whrCommonFt[] = ["project", "=", $project];
|
|
|
+ $whrCommonFt[] = ["project", "=", ProjectState::INTEGRAL];
|
|
|
$whrCommonFt[] = ["active", "=", 1];
|
|
|
$whrCommonFt[] = ["delete", "=", 0];
|
|
|
- $whrCommonFt[] = ["type", "=", ProjectState::INTEGRAL];
|
|
|
+ $whrCommonFt[] = ["type", "=", $this->user["type"]];
|
|
|
$whrCommonFt[] = ["isConditionFile", "=", 1];
|
|
|
$common_fts = Db::table("new_common_filetype")->where($whrCommonFt)->select()->toArray();
|
|
|
$common_ft_ids = array_column($common_fts, "id");
|