Merge branch 'dongxiaoqin_0220'

app/workerapi/controller/InterviewController.php

@@ -242,7 +242,7 @@ class InterviewController extends BaseApiController
                 }
                 $item['answer'] = $answer;
             }
-            if ($rights / count($data) >= 0.8) {
+            if ($rights / count($data) >= 0.6) {
                 $result = $list3; 
             } else {
                 $has_next = 0;

app/workerapi/logic/MasterWorkerLogic.php

@@ -368,6 +368,7 @@ class MasterWorkerLogic extends  BaseLogic
             $list = MasterWorkerQuestion::where('type',$params['type'])
                         ->whereIn('category', $category)
                         ->where('type',$params['type'])
+                        ->where('question_type','<>',2)
                         ->limit(100)
                         ->select()
                         ->toArray();