Merge branch 'master' of http://gitlab.frkj.cc/php/zhjwxt

# Conflicts:
#	admin/src/app/views/campus_person_role/campus_person_role.vue

admin/src/app/views/campus_person_role/campus_person_role.vue

@@ -34,12 +34,12 @@
           </el-form-item>
 
           <el-form-item :label="t('personId')" prop="person_id">
-			  
+
 			  <el-input
 			    v-model="campusPersonRoleTable.searchParam.person_name"
 			    :placeholder="t('personIdPlaceholder')"
 			  />
-			  
+
        <!--     <el-select
               class="w-[280px]"
               v-model="campusPersonRoleTable.searchParam.person_id"
@@ -123,14 +123,14 @@
             :show-overflow-tooltip="true"
           />
 
-			
+
 			<el-table-column
 			  prop="phone"
 			  label="电话"
 			  min-width="120"
 			  :show-overflow-tooltip="true"
 			/>
-			
+
           <el-table-column
             prop="role_id_name"
             :label="t('roleId')"

niucloud/app/service/api/login/LoginService.php

@@ -375,6 +375,7 @@ class LoginService extends BaseApiService
         //获取用户部门ids（1市场、2教师、3销售）
         $depts = (new CampusPersonRole())->where('person_id', $member_info->id)->column('dept_id');
         $user_type = in_array($params['login_type'],$depts) ? $params['login_type'] : '';
+
         return [
             'token' => $token_info['token'],//token
             'expires_time' => $token_info['params']['exp'],//过期时间