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

Master server



查看合并请求 !1030

@@ -327,7 +327,7 @@ class ProjectController extends BaseController
                     ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.quality_mid', $info['id'])
                     ->orWhere('gl_project_deploy_optimize.design_mid', $info['id']);
                     ->orWhere('gl_project_deploy_optimize.design_mid', $info['id']);
                 // 处理 dept_id 条件
                 // 处理 dept_id 条件
-                if (in_array($info['dept_id'], [7, 9])) {
+                if (in_array($info['belong_group'], [7, 9])) {
                     // 7, 9 代表合并组 H + F 组
                     // 7, 9 代表合并组 H + F 组
                     $subQuery->orWhere(function ($innerQuery) {
                     $subQuery->orWhere(function ($innerQuery) {
                         $innerQuery->where('gl_project_deploy_build.dept_id', 7)
                         $innerQuery->where('gl_project_deploy_build.dept_id', 7)

@@ -79,10 +79,10 @@ class ExtensionModuleController extends BaseController
             if($info !== false){
             if($info !== false){
                 $v['is_use'] = 1;
                 $v['is_use'] = 1;
             }
             }
-            $list[$k] = $v;
             if(!empty($v['data'])){
             if(!empty($v['data'])){
                 $v['data'] = json_decode($v['data'],true);
                 $v['data'] = json_decode($v['data'],true);
             }
             }
+            $list[$k] = $v;
         }
         }
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }