From 8064549857d1cbfc9e7b80024f666a3b006ed3e0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 三月 2025 21:37:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
index a84e295..9903431 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
@@ -327,10 +327,14 @@
List<CoachSerchVO> coachSerchVOS = coachClient.listAll(coachQuery);
for (CoachSerchVO coachSerchVO : coachSerchVOS) {
Integer cityManagerId = coachSerchVO.getCityManagerId();
- TOperator byId = operatorService.getById(cityManagerId);
- Integer userId = byId.getUserId();
- User byId1 = userService.getById(userId);
- coachSerchVO.setNameAndPhone(byId.getName()+""+byId1.getPhone());
+ if(0 == cityManagerId){
+ coachSerchVO.setNameAndPhone("平台");
+ }else {
+ TOperator byId = operatorService.getById(cityManagerId);
+ Integer userId = byId.getUserId();
+ User byId1 = userService.getById(userId);
+ coachSerchVO.setNameAndPhone(byId.getName()+""+byId1.getPhone());
+ }
}
return coachSerchVOS;
}
--
Gitblit v1.7.1