合并分支 'master-server' 到 'master'

修复项目错误wentiBUG 查看合并请求 !1029

合并分支 'master-server' 到 'master'
修复项目错误wentiBUG 查看合并请求 !1029
李宇航
app/Http/Controllers/Aside/Project/ProjectController.php
--- a/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @e2396e3
+++ b/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @e2396e3
@@ -327,7 +327,7 @@ class ProjectController extends BaseController
                     ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.design_mid', $info['id']);
                 // 处理 dept_id 条件
-                if (in_array($this->map['dept_id'], [7, 9])) {
+                if (in_array($info['dept_id'], [7, 9])) {
                     // 7, 9 代表合并组 H + F 组
                     $subQuery->orWhere(function ($innerQuery) {
                         $innerQuery->where('gl_project_deploy_build.dept_id', 7)