From 1d64c14b6b0e9bbcae2736f83c0a498b5083d1d6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 17:11:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
index d918033..c0fe645 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PhoneController.java
@@ -58,8 +58,8 @@
@GetMapping("/getSysPhone")
@ApiOperation(value = "获取客服电话", tags = {"管理后台-客服电话", "门店后台-客服电话"})
public R<Phone> getSysPhone(){
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Long userId = tokenService.getLoginUser().getSysUser().getUserId();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
LambdaQueryWrapper<Phone> wrapper = new LambdaQueryWrapper<>();
if(sysUser.getRoleType() == 1){
wrapper.eq(Phone::getType, 1);
@@ -75,8 +75,8 @@
@PostMapping("/savePhone")
@ApiOperation(value = "保存客服电话", tags = {"管理后台-客服电话", "门店后台-客服电话"})
public R savePhone(@RequestBody Phone phone){
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Long userId = tokenService.getLoginUser().getSysUser().getUserId();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
//平台配置
if(sysUser.getRoleType() == 1){
Phone one = phoneService.getOne(new LambdaQueryWrapper<Phone>().eq(Phone::getType, 1));
--
Gitblit v1.7.1