Merge branch 'master' of https://git.hap-job.com/SamLu/Mina

pages/select-info/index.js

@@ -45,45 +45,53 @@ Page({
     console.log("dfg22", currentUser)
     var userRealName = [];
     var userIdCardNumber = [];
+    var year;
+    var realName;
+    var realName1;
+    var idCardNumber;
+    var idCardNumber1 = '';
     for (var i = 0; i < userList.length; i++) {
       //年龄换算
-      var year = userList[i].hpResume.birthYear;
-      if (year) {
-        var date = new Date;
-        var year1 = date.getFullYear();
-        year = year1 - year + 1;
+      if (userList[i].hpResume != null){
+        year = userList[i].hpResume.birthYear;
+        if (year) {
+          var date = new Date;
+          var year1 = date.getFullYear();
+          year = year1 - year + 1;
+        }
+        //头像为空处理
+        if (!userList[i].hpResume.headImg) {
+          userList[i].hpResume.headImg = `${imgServerUrl}/images/avatar/man.png`;
+        }
+        userList[i].hpResume.birthYear = year;
       }
-      //真实姓名加*处理
-      var realName = userList[i].hpUser.realName;
-      var realName1 = '';
-      if (realName) {
-        for (var j = 0; j < realName.length; j++) {
-          if (j == 0) {
-            realName1 = '*';
-          } else {
-            realName1 = realName1 + realName[j];
+      if (userList[i].hpUser != null){
+        //真实姓名加*处理
+        realName = userList[i].hpUser.realName;
+        if (realName) {
+          for (var j = 0; j < realName.length; j++) {
+            if (j == 0) {
+              realName1 = '*';
+            } else {
+              realName1 = realName1 + realName[j];
+            }
           }
         }
-      }
-      userRealName.push(realName1);
-      //身份证号加*处理
-      var idCardNumber = userList[i].hpUser.idCardNumber;
-      var idCardNumber1 = '';
-      if (idCardNumber) {
-        for (var j = 0; j < idCardNumber.length; j++) {
-          if (j > 5 && j < 14) {
-            idCardNumber1 = idCardNumber1 + '*';
-          } else {
-            idCardNumber1 = idCardNumber1 + idCardNumber[j];
+        userRealName.push(realName1);
+
+        //身份证号加*处理
+        idCardNumber = userList[i].hpUser.idCardNumber;
+        if (idCardNumber) {
+          for (var j = 0; j < idCardNumber.length; j++) {
+            if (j > 5 && j < 14) {
+              idCardNumber1 = idCardNumber1 + '*';
+            } else {
+              idCardNumber1 = idCardNumber1 + idCardNumber[j];
+            }
           }
         }
+        userIdCardNumber.push(idCardNumber1);
       }
-      userIdCardNumber.push(idCardNumber1);
-      //头像为空处理
-      if (!userList[i].hpResume.headImg) {
-        userList[i].hpResume.headImg = `${imgServerUrl}/images/avatar/man.png`;
-      }
-      userList[i].hpResume.birthYear = year;
     }
     this.setData({
       userList: userList,