From b7bb5daa5f4ffe1764a363a051a5d6f868168cf9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 20:56:31 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpUserFeedbackController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpUserFeedbackController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpUserFeedbackController.java
index 8fe9309..15f2d5b 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpUserFeedbackController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpUserFeedbackController.java
@@ -1,10 +1,13 @@
 package com.xiaopeng.operation.controller;
 
 
+import cn.hutool.core.util.DesensitizedUtil;
 import com.xiaopeng.api.feignClient.account.SysGroupMenuClient;
 import com.xiaopeng.api.model.operation.XpUserFeedback;
+import com.xiaopeng.api.vo.account.LoginUser;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.common.security.service.TokenService;
 import com.xiaopeng.operation.dto.XpUserFeedbackDto;
 import com.xiaopeng.operation.query.UserFeedBackQuery;
 import com.xiaopeng.operation.service.IXpUserFeedbackService;
@@ -39,6 +42,8 @@
     private final IXpUserFeedbackService xpUserFeedbackService;
     @Resource
     private SysGroupMenuClient groupMenuClient;
+    @Resource
+    private TokenService tokenService;
 
     public XpUserFeedbackController(IXpUserFeedbackService xpUserFeedbackService) {
         this.xpUserFeedbackService = xpUserFeedbackService;
@@ -65,8 +70,11 @@
     @ApiOperation(value = "获取意见反馈分页列表", tags = {"管理后台-服务中心"})
     @PostMapping(value = "/api/v1/userFeedBack/pageList")
     public R<PageInfo<XpUserFeedbackVO>> getPageList(@RequestBody UserFeedBackQuery query) {
+        LoginUser loginUser = tokenService.getLoginUser();
         PageInfo<XpUserFeedbackVO> pageList = xpUserFeedbackService.getPageList(query);
-        pageList.getRecords().forEach(s->s.setPhone(groupMenuClient.getPhoneDesensitization(s.getPhone()).getData()));
+        if(!loginUser.getPhoneDesensitizationExempt()){
+            pageList.getRecords().forEach(s->s.setPhone(DesensitizedUtil.mobilePhone(s.getPhone())));
+        }
         return R.ok();
     }
 }

--
Gitblit v1.7.1