合并代码

无关风月

2025-01-21 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db

 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;
    }