Merge pull request 'patch' (#53) from zhangwei into dev

Reviewed-on: #53
This commit is contained in:
weiz 2023-10-07 11:28:42 +08:00
commit cb976433ce

View File

@ -224,10 +224,10 @@ class ImController extends BaseLikeAdminController
$sendData = [ $sendData = [
'id' => $model->id, 'id' => $model->id,
'from_user_id' => $params['from_user_id'], 'from_user_id' => $params['from_user_id'],
'from_user_name' => $fromUserInfo['nickname'], 'from_user_name' => $fromUserInfo['name'],
'from_user_avatar' => $fromUserInfo['avatar'], 'from_user_avatar' => $fromUserInfo['avatar'],
'to_user_id' => $params['to_user_id'], 'to_user_id' => $params['to_user_id'],
'to_user_name' => $toUserInfo['nickname'], 'to_user_name' => $toUserInfo['name'],
'to_user_avatar' => $toUserInfo['avatar'], 'to_user_avatar' => $toUserInfo['avatar'],
'content' => $result['data'], 'content' => $result['data'],
'type' => $params['type'], 'type' => $params['type'],
@ -336,6 +336,7 @@ class ImController extends BaseLikeAdminController
return $this->success('请求成功',$users); return $this->success('请求成功',$users);
} }
//获取片区经理用户id
public function getAreaManager(): Json public function getAreaManager(): Json
{ {
//验证请求方式 //验证请求方式