Wesmiler 校企小程序 更新 6.24

app/api/controller/User.php

@@ -43,7 +43,12 @@ class User extends Controller
             $userInfo = \app\api\model\User::detail($userId);
             if($userInfo){
                 $userInfo['info'] = isset($userInfo['info'])? $userInfo['info'] : [];
-                $userInfo['info']['school'] = isset($userInfo['info']['school'])? $userInfo['info']['school'] : [];
+                if($userInfo['user_type'] == 3){
+                    $userInfo['info']['school'] = isset($userInfo['info']['school'])? $userInfo['info']['school'] : [];
+                }else{
+                    $userInfo['info']['school'] = isset($userInfo['info']['sourceSchool'])? $userInfo['info']['sourceSchool'] : [];
+                    unset($userInfo['info']['sourceSchool']);
+                }
                 $userInfo['avatar'] = isset($userInfo['avatar'])? $userInfo['avatar'] : [];
             }
         }else{

app/api/model/User.php

@@ -180,7 +180,12 @@ class User extends UserModel
         $userInfo = self::detail($userId);
         $userInfo['info'] = $userInfo['info'] ? $userInfo['info'] : [];
         if ($userInfo['info']) {
-            $userInfo['info']['school'] = isset($userInfo['info']['school']) && $userInfo['info']['school'] ? $userInfo['info']['school'] : [];
+            if($userInfo['user_type'] == 3){
+                $userInfo['info']['school'] = isset($userInfo['info']['school']) && $userInfo['info']['school'] ? $userInfo['info']['school'] : [];
+            }else{
+                $userInfo['info']['school'] = isset($userInfo['info']['sourceSchool']) && $userInfo['info']['sourceSchool'] ? $userInfo['info']['sourceSchool'] : [];
+                unset($userInfo['info']['sourceSchool']);
+            }
         }
         if (empty($userInfo) || $userInfo['is_delete']) {
             throwError('很抱歉，用户信息不存在或已删除', config('status.not_logged'));

app/api/model/UserInfo.php

@@ -11,7 +11,6 @@
 declare (strict_types=1);
 
 namespace app\api\model;
-use app\common\model\User;
 use app\common\model\UserInfo as UserInfoModel;
 use app\store\model\Setting as SettingModel;
 use think\facade\Cache;

app/common/model/UserInfo.php

@@ -71,6 +71,7 @@ class UserInfo extends BaseModel
      */
     public function sourceSchool(): HasOne
     {
+        return $this->hasOne("SourceShool", 'source_shools_id', 'school_id')->field('source_shools_id as id,source_shools_name as school_name')->bind(['school_name']);
     }
 
     /**