高教初审可随时跳过部门审核

app/admin/controller/Talent.php

@@ -975,11 +975,11 @@ class Talent extends AdminController {
                 $data["pass_dept_check"] = 1;
             }
         } else if ($params["checkState"] == 4) {
-            if ($talent_info["highProcess"] < 3)
+            if ($talent_info["highProcess"] < 3 && $ep["type"] != CommonConst::ENTERPRISE_GJ)
                 return json(["msg" => "只有曾经达到过部门并审，初审时才可以选择直接跳过部门并审阶段"]);
 //审核成功,并设置越过部门并审。附加条件：最高进度曾经通过初审3，上级驳回后重新初审的
             $log_checkState = $checkState = TalentState::FST_VERIFY_PASS; //初审成功
-            if ($talent_info["highProcess"] >= 3) {
+            if ($talent_info["highProcess"] >= 3 || $ep["type"] == CommonConst::ENTERPRISE_GJ) {
                 $data["pass_dept_check"] = 1;
             }
         } else if ($params["checkState"] == 5) {

public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -391,6 +391,7 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     var companyList = data.obj.companys;
                     var fileList = data.obj.fileList;
                     var process = data.obj.process;
+                    var type = data.obj.type;
                     if (typeof data.obj.fieldList != "undefined" && data.obj.fieldList.length > 0) {
                         var fieldList = data.obj.fieldList;
                         var html1 = '';
@@ -414,7 +415,7 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     if (process <= 4 && process != 2) {
                         optionHtml = '<option value="">请选择</option>\n' +
                                 (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 && !another_way_pass_deptverify ? '<option value="5">审核通过(需要再次部门并审)</option>\n' : '<option value="3">审核通过</option>') +
-                                (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 && !another_way_pass_deptverify ? '<option value="4">审核通过(跳过部门并审)</option>\n' : "") +
+                                ((obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 && !another_way_pass_deptverify) || (type == 6 && process == 3) ? '<option value="4">审核通过(跳过部门并审)</option>\n' : "") +
                                 '                            <option value="2">审核驳回</option>\n';
                     }
                     if (process == 5 || process == 2) {