From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 21 一月 2025 18:15:00 +0800 Subject: [PATCH] 合并代码 --- 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