Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sys/mapper/HpMemberMapper.java

@@ -22,4 +22,6 @@ public interface HpMemberMapper extends BaseMapper<HpMember> {
     List<HpMember> findMemberList(HpMember hpMember);
 
     void approve(HpMember hpMember);
+
+    HpMember getAPI(String memberId);
 }

src/main/java/com/jeeplus/modules/sys/mapper/xml/HpMemberMapper.xml

@@ -70,7 +70,23 @@
 		su.use_flag AS "hpUser.useFlag",
 		su.user_type as "hpUser.userType"
 	</sql>
-	
+
+	<sql id="hpMemberColumnsAPI">
+		a.id AS "id",
+		a.phone AS "phone",
+		a.real_name AS "realName",
+		a.gender AS "gender",
+		a.birth_year AS "birthYear",
+		a.id_card_number AS "idCardNumber",
+		a.id_card_front AS "idCardFront",
+		a.id_card_back AS "idCardBack",
+		a.id_card_hold AS "idCardHold",
+		a.authentication_status AS "authenticationStatus",
+		a.member_type AS "memberType",
+		a.qrcode AS "qrcode",
+		a.del_flag AS "delFlag"
+	</sql>
+
 	<sql id="hpMemberJoins">
 		LEFT JOIN hp_user su on su.id=a.user_id
 		LEFT JOIN hp_resume r ON r.user_id = a.id
@@ -331,4 +347,11 @@
 			authentication_status = #{authenticationStatus}
 		WHERE id = #{id}
 	</update>
+
+	<select id="getAPI" resultType="HpMember">
+		SELECT
+		<include refid="hpMemberColumnsAPI"/>
+		FROM hp_member a
+		WHERE a.id = #{0}
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sys/service/HpMemberService.java

@@ -162,4 +162,8 @@ public class HpMemberService extends CrudService<HpMemberMapper, HpMember> {
         hpUserContact.setContactUser(hpMember.getContactPerson());
         hpUserContactService.save(hpUserContact);
     }
+
+    public HpMember getAPI(String memberId) {
+        return mapper.getAPI(memberId);
+    }
 }

src/main/java/com/jeeplus/modules/sys/service/HpUserService.java

@@ -1793,7 +1793,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
             //验证用户合法性
             if (TokenUtil.validateToken(userId, userToken)) {
                 HpUser hpUser = this.get(userId);
-                HpMember hpMember = hpMemberService.get(memberId);
+                HpMember hpMember = hpMemberService.getAPI(memberId);
                 //手机用户
                 if (StringUtils.isNotBlank(loginType)) {
                     if ("1".equals(loginType)) {