1

app/admin/controller/Talent.php

@@ -144,12 +144,12 @@ class Talent extends AdminController {
                     return view("/talent/hospital/new_talentInfo_common_check", ["info" => $info]);
                 case CommonConst::ENTERPRISE_GJ:
                     $config = getJsonConfig("../sys_config.json", "gj_special_person");
-                    if(array_key_exists($info['card_number'],$config)){
+                    if (array_key_exists($info['card_number'], $config)) {
                         $allow_other_place = 1;
-                    }else{
+                    } else {
                         $allow_other_place = 0;
                     }
-                    return view("/talent/school/talentInfo_common_check", ["info" => $info,'allow_other_place' => $allow_other_place]);
+                    return view("/talent/school/talentInfo_common_check", ["info" => $info, 'allow_other_place' => $allow_other_place]);
             }
         }
     }
@@ -1513,7 +1513,7 @@ class Talent extends AdminController {
         if (!$talent_info || !$ep) {
             return json(["msg" => "数据错误"]);
         }
-        if ($ep["type"] != $this->user["type"]) {
+        if ($ep["type"] != $this->user["type"] && in_array($checkState, [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_PASS])) {
             return json(["msg" => "不能审核的人才类型"]);
         }
         if (!$check) {
@@ -1536,6 +1536,9 @@ class Talent extends AdminController {
                     return json(["msg" => "你的部门不在并审部门列表"]);
                 return $this->deptCheck($request, $talent_info, $companys);
             } else {
+                if ($ep["type"] != $this->user["type"]) {
+                    return json(["msg" => "不能审核的人才类型"]);
+                }
                 return $this->reCheck($request, $talent_info);
             }
         } else if ($checkState == TalentState::DEPT_VERIFY_PASS) {
@@ -1554,7 +1557,7 @@ class Talent extends AdminController {
         if (!$talent_info || !$ep) {
             return json(["msg" => "数据错误"]);
         }
-        if ($ep["type"] != $this->user["type"]) {
+        if ($ep["type"] != $this->user["type"] && in_array($checkState, [TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS, TalentState::SCND_SUBMIT, TalentState::DEPT_VERIFY_PASS])) {
             return json(["msg" => "不能审核的人才类型"]);
         }
         if ($checkState == TalentState::FST_SUBMIT) {
@@ -1571,6 +1574,9 @@ class Talent extends AdminController {
                     return json(["msg" => "你的部门不在并审部门列表"]);
                 return $this->deptSubmitCheck($talent_info, $companys);
             } else {
+                if ($ep["type"] != $this->user["type"]) {
+                    return json(["msg" => "不能审核的人才类型"]);
+                }
                 return $this->reSubmitCheck($talent_info);
             }
         } else if ($checkState == TalentState::DEPT_VERIFY_PASS) {

app/index/view/auth/login.html

@@ -262,7 +262,7 @@
                             Feng.info("请填写手机验证码!");
                             return;
                         }
-                        if (!/0?(13|14|15|17|18|19)[0-9]{9}/.test(phone)) {
+                        if (!/0?(13|14|15|16|17|18|19)[0-9]{9}/.test(phone)) {
                             Feng.info("手机号格式不合法!");
                             return;
                         }

public/static/js/register.js

@@ -732,7 +732,7 @@ Register.personUserRegister = function () {
         Feng.info("请填写手机验证码!")
         return;
     }
-    if (!/0?(13|14|15|17|18|19)[0-9]{9}/.test(phone)) {
+    if (!/0?(13|14|15|16|17|18|19)[0-9]{9}/.test(phone)) {
         Feng.info("手机号格式不合法!");
         return;
     }

public/static/modular/gate/education/childschoolFees/childschoolFees_info.js

@@ -16,7 +16,7 @@ var ChildschoolFeesInfoDlg = {
                     message: '联系电话不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/education/educationSchool/educationSchool_info.js

@@ -21,7 +21,7 @@ var EducationSchoolInfoDlg = {
                     message: '联系电话不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/house/housepurchase_info.js

@@ -45,7 +45,7 @@ var HousepurchaseInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/house/housepurchase_select.js

@@ -45,7 +45,7 @@ var HousepurchaseInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/integral/integralInfo.js

@@ -22,7 +22,7 @@ var IntegralInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/master/livingAllowanceInfo/livingAllowanceInfo_info.js

@@ -23,7 +23,7 @@ var LivingAllowanceInfoInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/medical/medicalSubsidy_info.js

@@ -12,7 +12,7 @@ var MedicalSubsidyInfoDlg = {
                     message: '联系电话不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/register.js

@@ -272,7 +272,7 @@ Register.personUserRegister = function() {
 		Feng.info("请填写手机验证码!")
 		return;
 	}
-	if(!/0?(13|14|15|17|18|19)[0-9]{9}/.test(phone)){
+	if(!/0?(13|14|15|16|17|18|19)[0-9]{9}/.test(phone)){
 		Feng.info("手机号格式不合法!");
 		return;
 	}

public/static/modular/gate/talentBase/talentInfo_ic_info.js

@@ -21,7 +21,7 @@ var TalentInfoInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp :{
-                    regexp:/0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp:/0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message:"手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentBase/talentInfo_info.js

@@ -92,7 +92,7 @@ var TalentInfoInfoDlg = step == 1 ? {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }
@@ -1053,7 +1053,7 @@ TalentInfoInfoDlg.__initValidateCondition = function () {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentInfo/new_nofile_talentInfo_info.js

@@ -87,7 +87,7 @@ var TalentInfoInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentInfo/new_talentInfo_info.js

@@ -97,7 +97,7 @@ var TalentInfoInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentInfo/new_talentInfo_wj_info.js

@@ -8,7 +8,7 @@ var TalentInfoInfoDlg = {
         phone: {
             validators: {
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }
@@ -52,7 +52,7 @@ var TalentInfoInfoDlg = {
         phone: {
             validators: {
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentInfo/talentInfo_gj_info.js

@@ -42,7 +42,7 @@ var TalentInfoInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentInfo/talentInfo_ic_info.js

@@ -34,7 +34,7 @@ var TalentInfoInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentInfo/talentInfo_info.js

@@ -106,7 +106,7 @@ var TalentInfoInfoDlg = step == 1 ? {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }
@@ -1008,7 +1008,7 @@ TalentInfoInfoDlg.__initValidateCondition = function () {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentInfo/talentInfo_wj_info.js

@@ -8,7 +8,7 @@ var TalentInfoInfoDlg = {
         phone: {
             validators: {
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }
@@ -60,7 +60,7 @@ var TalentInfoInfoDlg = {
         phone: {
             validators: {
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentLibrary/talentQuit/talentQuit_info.js

@@ -15,7 +15,7 @@ var TalentQuitInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentLibrary/talentQuit/talentQuit_select.js

@@ -14,7 +14,7 @@ var TalentQuitInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentLibrary/talentWorkunitChange/talentWorkunitChange_info.js

@@ -22,7 +22,7 @@ var TalentWorkunitChangeInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/talentLibrary/talentWorkunitChange/talentWorkunitChange_select.js

@@ -20,7 +20,7 @@ var TalentWorkunitChangeInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp: {
-                    regexp: /0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp: /0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message: "手机号码格式不正确"
                 }
             }

public/static/modular/gate/training/trainingSubsidy_info.js

@@ -20,7 +20,7 @@ var TrainingSubsidyInfoDlg = {
                     message: '手机号码不能为空'
                 },
                 regexp :{
-                    regexp:/0?(13|14|15|17|18|19)[0-9]{9}/,
+                    regexp:/0?(13|14|15|16|17|18|19)[0-9]{9}/,
                     message:"手机号码格式不正确"
                 }
             }