获取完善用户信息接口返回志愿者标签信息

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java

@@ -93,4 +93,9 @@ public class EpdcCompleteUserInfoDTO implements Serializable {
      * 自我介绍
      */
     private String introduce;
+
+    /**
+     * 志愿者标签
+     */
+    private String volunteerTagId;
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -892,6 +892,7 @@ public class AppUserServiceImpl implements AppUserService {
                 dto.setVolunteerNickname(volunteerInfoDTO.getData().getVolunteerNickname());
                 dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature());
                 dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce());
+                dto.setVolunteerTagId(volunteerInfoDTO.getData().getTagId());
                 // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证
                 if (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) {
                     dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo());

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -204,8 +204,10 @@
     <!--  根据用户id查询志愿者信息  -->
     <select id="selectOneVolunteerInfoDTO" parameterType="java.lang.String"
             resultType="com.elink.esua.epdc.dto.VolunteerInfoDTO">
-        select *
+        select m.*,
+               vt.tag_id
      from epdc_volunteer_info m
+        left join epdc_volunteer_tag_relation vt on vt.VOLUNTEER_ID = m.id and vt.del_flag = '0'
         where m.DEL_FLAG='0'
         and m.USER_ID=#{userId}
     </select>