diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java index 37f4055..03bfbe0 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java @@ -206,4 +206,6 @@ public interface OrganizationalDao{ TeamGroupBean getRegisterTeamGroup(TeamGroupBean bean); List getTeamPersons(TeamGroupBean teamGroupBean); + + TeamGroupBean getTeamPersonsLeader(TeamGroupBean teamGroupBean); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java index 4be727c..3eef907 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java @@ -461,6 +461,7 @@ public class OrganizationalServiceImpl implements OrganizationalService { AjaxRes ar = new AjaxRes(); try { OrganizationalBean o = new OrganizationalBean(); + o.setId(bean.getId()); if (StringUtils.isNotBlank(bean.getIdCard()) || StringUtils.isNotBlank(bean.getPhone())) { o.setIdCard(bean.getIdCard()); o.setUserPhone(bean.getPhone()); @@ -520,8 +521,17 @@ public class OrganizationalServiceImpl implements OrganizationalService { @Override public TeamGroupBean getRegisterTeamGroup(TeamGroupBean bean) { TeamGroupBean teamGroupBean = mapper.getRegisterTeamGroup(bean); - // 获取班长和组员信息 - teamGroupBean.setTeamPersons(mapper.getTeamPersons(teamGroupBean)); + // 获取班长信息 + TeamGroupBean leader = mapper.getTeamPersonsLeader(teamGroupBean); + teamGroupBean.setName(leader.getName()); + teamGroupBean.setPhone(leader.getPhone()); + teamGroupBean.setIdCard(leader.getIdCard()); + teamGroupBean.setWorkType(leader.getWorkType()); + teamGroupBean.setSex(leader.getSex()); + teamGroupBean.setFaceUrl(leader.getFaceUrl()); + // 获取组员信息 + List teamPersons = mapper.getTeamPersons(teamGroupBean); + teamGroupBean.setTeamPersons(teamPersons); return teamGroupBean; } diff --git a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml index 6a1e073..42fba01 100644 --- a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml +++ b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml @@ -471,6 +471,18 @@ face_url faceUrl, is_team_leader isTeamLeader from team_person - where team_id = #{id} + where team_id = #{id} and is_team_leader != 0 + + diff --git a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml index fc1ef2b..4726bb3 100644 --- a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml +++ b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml @@ -198,7 +198,6 @@ SELECT poi.id, poi.name teamGroupName, - poi.apply_man applyMan, poi.create_time createTime, poi.info_file_url infoFileUrl, poi.audit_status auditStatus,