实名认证返回字段修改

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/RealNameAuthDO.java

@@ -53,7 +53,7 @@ public class RealNameAuthDO implements Serializable {
 
     public RealNameAuthDTO buildRealNameAuthDTO() {
         SimpleDateFormat cur = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        return RealNameAuthDTO.builder().id(this.id).userAccountId(this.userAccountId).uid(this.id + "")
+        return RealNameAuthDTO.builder().id(this.id).userAccountId(this.userAccountId).uid(this.userAccountId + "")
                 .nickName(this.nickName).userName(this.userName).phoneNum(this.phoneNum).idNumber(this.idNumber)
                 .resAddress(this.resAddress).checkStatus(this.checkStatus)
                 .createTime((this.createTime == null) ? null : cur.format(this.createTime)).remark(this.remark).build();

csm-service/cms-service-user/src/main/resources/mapper/RealNameAuthDao.xml

@@ -110,7 +110,7 @@
     <select id="countListRealNameAuth" resultType="java.lang.Integer">
         select count(*) from user_account ua inner join real_name_auth rna on
         ua.id=rna.user_account_id
-        where ua.`disable` = 0 and check_status = 1
+        where ua.`disable` = 0 and rna.check_status = 1
         <if test="keyword != null and keyword != '' ">
             and ( ua.id like concat('%',#{keyword},'%')
             or
@@ -119,9 +119,6 @@
             concat('%',#{keyword},'%')
             )
         </if>
-        <if test="checkStatus != null ">
-            and rna.check_status = #{checkStatus}
-        </if>
     </select>
 
     <select id="listRealNameAuth" resultType="com.mmc.iuav.user.entity.RealNameAuthDO"
@@ -130,7 +127,7 @@
         rna.id,rna.user_account_id,ua.nick_name,rna.user_name,ua.phone_num,rna.check_status,rna.create_time,rna.remark
         from user_account ua inner join real_name_auth rna on
         ua.id=rna.user_account_id
-        where ua.`disable` = 0
+        where ua.`disable` = 0 and rna.check_status = 1
         <if test="keyword != null and keyword != '' ">
             and ( ua.id like concat('%',#{keyword},'%')
             or
@@ -139,9 +136,6 @@
             concat('%',#{keyword},'%')
             )
         </if>
-        <if test="checkStatus != null ">
-            and rna.check_status = #{checkStatus}
-        </if>
         order by rna.create_time DESC
         limit #{pageNo},#{pageSize}
     </select>