src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OrganizationalDao.java

@@ -206,6 +206,4 @@ public interface OrganizationalDao{
     TeamGroupBean getRegisterTeamGroup(TeamGroupBean bean);
 
     List<teamGroupPersonBean> getTeamPersons(TeamGroupBean teamGroupBean);
-
-    TeamGroupBean getTeamPersonsLeader(TeamGroupBean teamGroupBean);
 }

src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java

@@ -521,17 +521,8 @@ public class OrganizationalServiceImpl implements OrganizationalService {
     @Override
     public TeamGroupBean getRegisterTeamGroup(TeamGroupBean bean) {
         TeamGroupBean teamGroupBean = mapper.getRegisterTeamGroup(bean);
-        // 获取班长信息
-        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<teamGroupPersonBean> teamPersons = mapper.getTeamPersons(teamGroupBean);
-        teamGroupBean.setTeamPersons(teamPersons);
+        // 获取班长和组员信息
+        teamGroupBean.setTeamPersons(mapper.getTeamPersons(teamGroupBean));
         return teamGroupBean;
     }
 

src/main/resources/mappers/evaluate/OrganizationalMapper.xml

@@ -471,18 +471,6 @@
                face_url faceUrl,
                is_team_leader isTeamLeader
         from team_person
-        where team_id = #{id} and is_team_leader != 0
-    </select>
-    <select id="getTeamPersonsLeader" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.TeamGroupBean">
-        select id,
-               name,
-               id_card idCard,
-               phone,
-               sex,
-               work_type workType,
-               face_url faceUrl,
-               is_team_leader isTeamLeader
-        from team_person
-        where team_id = #{id} and is_team_leader = 0
+        where team_id = #{id}
     </select>
 </mapper>

src/main/resources/mappers/evaluate/TeamGroupMapper.xml

@@ -198,6 +198,7 @@
         SELECT
             poi.id,
             poi.name teamGroupName,
+            poi.apply_man applyMan,
             poi.create_time createTime,
             poi.info_file_url infoFileUrl,
             poi.audit_status auditStatus,