卫健高教去掉“是否认定福建省或泉州市高层次人才”与“是否符合晋江人才认定标准”同时勾选是时，跳过部门审核的设定

app/admin/controller/Talent.php

@@ -971,9 +971,9 @@ class Talent extends AdminController {
             if ($talent_info["isImport"] && $talent_info["isMatchZhiren"]) {
                 $data["pass_dept_check"] = 1;
             }
-            if (in_array($ep["type"], [CommonConst::ENTERPRISE_GJ, CommonConst::ENTERPRISE_WJ]) && $talent_info["is_fujian_talent"] == 1 && $talent_info["is_jinjiang_talent"] == 1) {
-                $data["pass_dept_check"] = 1;
-            }
+            /* if (in_array($ep["type"], [CommonConst::ENTERPRISE_GJ, CommonConst::ENTERPRISE_WJ]) && $talent_info["is_fujian_talent"] == 1 && $talent_info["is_jinjiang_talent"] == 1) {
+              $data["pass_dept_check"] = 1;
+              } */
         } else if ($params["checkState"] == 4) {
             if ($talent_info["highProcess"] < 3 && $ep["type"] != CommonConst::ENTERPRISE_GJ)
                 return json(["msg" => "只有曾经达到过部门并审，初审时才可以选择直接跳过部门并审阶段"]);

public/static/modular/talentIdentify/talentInfo/hospital/talentInfo_common_check_new.js

@@ -410,8 +410,8 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     var optionHtml = "";
                     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 ? '<option value="5">审核通过(需要再次部门并审)</option>\n' : '<option value="3">审核通过</option>') +
+                                (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 ? '<option value="4">审核通过(跳过部门并审)</option>\n' : "") +
                                 '                            <option value="2">审核驳回</option>\n' +
                                 (type == 5 && process == 3 ? '<option value="6">驳回到分院</option>\n' : '');
                     }

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

@@ -414,8 +414,8 @@ TalentInfoInfoDlg.showFirstCheckModal = function () {
                     var optionHtml = "";
                     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) || (type == 6 && process == 3) ? '<option value="4">审核通过(跳过部门并审)</option>\n' : "") +
+                                (obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0 ? '<option value="5">审核通过(需要再次部门并审)</option>\n' : '<option value="3">审核通过</option>') +
+                                ((obj.highProcess >= 3 && companyList.length > 0 && process == 3 && obj.isMatchZhiren == 0) || (type == 6 && process == 3) ? '<option value="4">审核通过(跳过部门并审)</option>\n' : "") +
                                 '                            <option value="2">审核驳回</option>\n';
                     }
                     if (process == 5 || process == 2) {