Merge remote-tracking branch 'origin/master'

h5app/src/views/pages/company/edit.vue

@@ -597,7 +597,8 @@ export default defineComponent({
     }
     const inputDataValidate = () =>{
       const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-      const landlineReg = /[0-9-()（）]{7,18}/;
+      // const landlineReg = /[0-9-()（）]{7,18}/;
+      const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
       if(!mobileReg.test(formState.dataModel.userMobile)&&!landlineReg.test(formState.dataModel.userMobile)){
         presentAlert("输入的联系电话有误!");
         isAllowCommit.value = false;

h5app/src/views/pages/company/editPost.vue

@@ -480,7 +480,8 @@ export default defineComponent({
       }
 
       const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-      const landlineReg = /[0-9-()（）]{7,18}/;
+      // const landlineReg = /[0-9-()（）]{7,18}/;
+      const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
       if (formState.dataModel.contactMobile != null) {
         if (!mobileReg.test(formState.dataModel.contactMobile) && !landlineReg.test(formState.dataModel.contactMobile)) {
           errorMessage += "输入的联系电话有误!";

h5app/src/views/pages/jobUserInfo/companyEdit.vue

@@ -534,7 +534,8 @@ export default defineComponent({
 
     const inputDataValidate = () =>{
       const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-      const landlineReg = /[0-9-()（）]{7,18}/;
+      // const landlineReg = /[0-9-()（）]{7,18}/;
+      const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
       if(!mobileReg.test(formState.dataModel.userMobile)&&!landlineReg.test(formState.dataModel.userMobile)){
         presentAlert("输入的联系电话有误!");
         isAllowCommit.value = false;

h5app/src/views/pages/jobUserInfo/postEdit.vue

@@ -456,7 +456,8 @@ export default defineComponent({
         }
       }
       const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-      const landlineReg = /[0-9-()（）]{7,18}/;
+      // const landlineReg = /[0-9-()（）]{7,18}/;
+      const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
       if(formState.dataModel.contactMobile != null){
         if(!mobileReg.test(formState.dataModel.contactMobile)&&!landlineReg.test(formState.dataModel.contactMobile)){
           errorMessage += "输入的联系电话有误!";

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -657,12 +657,14 @@ public class JobUserServiceImpl implements JobUserService {
                 else {
                     if(item.getKeyPersonTypeID().equals(2)&&stringUtils.IsNullOrEmpty(item.getFinishDate())){
                         errorInfo += "应届高校毕业生必须填写毕业日期!";
-                    }else{
-                        item.setFinishDate(item.getFinishDate().substring(0,7));
                     }
                 }
             }
 
+            if(!stringUtils.IsNullOrEmpty(item.getFinishDate()))
+                item.setFinishDate(item.getFinishDate().substring(0,7));
+
+
             if (stringUtils.IsNullOrEmpty(item.getJobStatusName()))
                 errorInfo += "请选择就业状态!";
             else {

src/main/java/com/hz/employmentsite/util/RegexUtils.java

@@ -92,7 +92,8 @@ public class RegexUtils {
      public boolean theMobileIsValid(String mobile,boolean isCompany) {
         String mobile_Regex = "^1[3|4|5|6|7|8|9]\\d{9}$";
         if(isCompany){
-            String landline_Reg = "[0-9-()（）]{7,18}";
+            //String landline_Reg = "[0-9-()（）]{7,18}";
+            String landline_Reg = "^((0\\d{2,3})-)(\\d{7,8})(-(\\d{3,}))?$";
             return mobile.matches(mobile_Regex)||mobile.matches(landline_Reg);
         }
         return mobile.matches(mobile_Regex);
@@ -101,7 +102,7 @@ public class RegexUtils {
     /**
      *验证邮箱是否合法
      *
-     * @param email 联系电话
+     * @param email 邮箱
      * @return 是否合法
      * */
     public boolean theEmailIsValid(String email){

vue/src/views/baseSettings/institution/edit.vue

@@ -313,7 +313,8 @@ export default defineComponent({
     const mobileValidate = ()=>{
       isAllowCommit.value = true;
       const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-      const landlineReg = /[0-9-()（）]{7,18}/;
+      // const landlineReg = /[0-9-()（）]{7,18}/;
+      const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
       if(!mobileReg.test(formData.dataModel.frMobile)){
         message.error("输入的法人电话有误!");
         isAllowCommit.value = false;
@@ -321,6 +322,9 @@ export default defineComponent({
       if (!mobileReg.test(formData.dataModel.fzrMobile) && !landlineReg.test(formData.dataModel.fzrMobile)) {
         message.error("输入的负责人电话有误!");
         isAllowCommit.value = false;
+      }else{
+        console.log(formData.dataModel.fzrMobile,mobileReg.test(formData.dataModel.fzrMobile));
+        console.log(formData.dataModel.fzrMobile,landlineReg.test(formData.dataModel.fzrMobile));
       }
     };
 

vue/src/views/baseSettings/siteInfo/edit.vue

@@ -314,7 +314,8 @@ export default defineComponent({
     const mobileValidate = ()=>{
       isAllowCommit.value = true;
       const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-      const landlineReg = /[0-9-()（）]{7,18}/;
+      // const landlineReg = /[0-9-()（）]{7,18}/;
+      const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
       if (!mobileReg.test(formData.dataModel.fzrMobile) && !landlineReg.test(formData.dataModel.fzrMobile)) {
         message.error("输入的联系电话有误!");
         isAllowCommit.value = false;

vue/src/views/companyService/company/edit.vue

@@ -604,7 +604,8 @@ export default defineComponent(
 
       const inputDataValidate = () =>{
         const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-        const landlineReg = /[0-9-()（）]{7,18}/;
+        // const landlineReg = /[0-9-()（）]{7,18}/;
+        const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
         if (!mobileReg.test(formState.dataModel.userMobile) && !landlineReg.test(formState.dataModel.userMobile)) {
           message.error("输入的联系电话有误!");
           isAllowCommit.value = false;

vue/src/views/companyService/post/edit.vue

@@ -477,7 +477,8 @@ export default defineComponent(
 
       const inputDataValidate = () => {
         const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-        const landlineReg = /[0-9-()（）]{7,18}/;
+        // const landlineReg = /[0-9-()（）]{7,18}/;
+        const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
         if (postCompany.dataModel.contactMobile != null && postCompany.dataModel.contactMobile.trim() != '') {
           if (!mobileReg.test(postCompany.dataModel.contactMobile) && !landlineReg.test(postCompany.dataModel.contactMobile)) {
             message.error("联系人电话格式有误!");

vue/src/views/jobUserManager/jobFair/edit.vue

@@ -201,7 +201,8 @@ async function loadData(jobFairId: string) {
 const mobileValidate = () => {
   isAllowCommit.value = true;
   const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-  const landlineReg = /[0-9]{3,4}[-][0-9]{8}/;
+  // const landlineReg = /[0-9]{3,4}[-][0-9]{8}/;
+  const landlineReg = /^((0\d{2,3})-)(\d{7,8})(-(\d{3,}))?$/;
   if (!mobileReg.test(formData.userMrobile) && !landlineReg.test(formData.userMrobile)) {
     message.error("输入的联系电话有误!");
     isAllowCommit.value = false;