wang jun 3 лет назад
Родитель
Сommit
557721531d
2 измененных файлов с 7 добавлено и 8 удалено
  1. 3 4
      application/index/controller/Resume.php
  2. 4 4
      application/index/model/usermodel.php

+ 3 - 4
application/index/controller/Resume.php

@@ -110,10 +110,9 @@ class Resume extends Base
         foreach ($list as $key => $value) {
             $where = ['id' => $value['resume_id']];
             $result = $l_r->getallinfobyid($where);
-            if (1 == $result['status']) {
-                $rlist[] = $result['data'];
-
-            }
+            $info = $result['data'];
+            $info['inventid'] = $value['invent_id'];
+            $rlist[] = $info;
         }
         return backjson(200, $rlist);
     }

+ 4 - 4
application/index/model/usermodel.php

@@ -108,8 +108,8 @@ class usermodel extends Model
      */
     public function getfieldbyopenid($openid, $field = "")
     {
-        if(empty($field)){
-            $field=["id", "user_name", "telno", "gender", "age", "email", "is_active", "is_company"];
+        if (empty($field)) {
+            $field = ["id", "user_name", "telno", "gender", "age", "email", "is_active", "is_company", "nation", "origin", "address"];
         }
         $where = ['openid' => $openid];
         $info = $this->field($field)->where($where)->find();
@@ -122,8 +122,8 @@ class usermodel extends Model
      */
     public function getfieldbyid($id, $field = "")
     {
-        if(empty($field)){
-            $field=["id", "user_name", "telno", "gender", "age", "email", "is_active", "is_company"];
+        if (empty($field)) {
+            $field = ["id", "user_name", "telno", "gender", "age", "email", "is_active", "is_company", "nation", "origin", "address"];
         }
         $where = ['id' => $id];
         $info = $this->field($field)->where($where)->find();