Merge remote-tracking branch 'origin/master'

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

@@ -206,4 +206,6 @@ 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

@@ -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<teamGroupPersonBean> teamPersons = mapper.getTeamPersons(teamGroupBean);
+        teamGroupBean.setTeamPersons(teamPersons);
         return teamGroupBean;
     }
 

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
+    </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
     </select>
 </mapper>

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,