Merge remote-tracking branch 'origin/test' into test

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java

@@ -22,8 +22,8 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable {
     /**
      * 身份证号码
      */
-    @NotBlank(message = "身份证号码不能为空")
     private String identityNo;
+
     /**
      * 手机号
      */

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

@@ -236,7 +236,6 @@ public class AppUserServiceImpl implements AppUserService {
             return new Result().ok(authorization);
         }
         TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class);
-        tokenDto.setUserId(userDto.getId());
 
         String state = userDto.getState();
         authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), state);
@@ -853,7 +852,7 @@ public class AppUserServiceImpl implements AppUserService {
         boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER);
         if (partyFlag) {
             GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO();
-            formDto.setUserId(cachingUserInfoDTO.getId());
+            formDto.setUserId(cachingUserInfoDTO.getUserId());
             formDto.setPartyMember(partyFlag ? NumConstant.ZERO_STR : NumConstant.ONE_STR);
             formDto.setNickname(cachingUserInfoDTO.getNickname());
             formDto.setUserAvatar(cachingUserInfoDTO.getFaceImg());

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java

@@ -2,7 +2,6 @@ package com.elink.esua.epdc.dto;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,7 +18,7 @@ public class CachingUserInfoDTO {
     /**
      * 用户ID
      */
-    private String id;
+    private String userId;
 
     /**
      * 昵称

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

@@ -383,7 +383,7 @@
     </select>
 
     <resultMap id="CachingUserInfoDTOMap" type="com.elink.esua.epdc.dto.CachingUserInfoDTO">
-        <result property="id" column="ID"/>
+        <result property="userId" column="ID"/>
         <result property="nickname" column="NICKNAME"/>
         <result property="mobile" column="MOBILE"/>
         <result property="faceImg" column="FACE_IMG"/>
@@ -400,26 +400,28 @@
     <!--  获取用户缓存信息  -->
     <select id="selectCachingUserInfoDTO" parameterType="map" resultMap="CachingUserInfoDTOMap">
         SELECT
-            eu.ID,
-            eu.NICKNAME,
-            eu.MOBILE,
-            eu.FACE_IMG,
-            eu.SEX,
-            eu.REAL_NAME,
-            eu.STATE,
-            eu.REMARK,
+        eu.ID,
+        eu.NICKNAME,
+        eu.MOBILE,
+        eu.FACE_IMG,
+        eu.SEX,
+        eu.REAL_NAME,
+        eu.STATE,
+        eu.REMARK,
         (select r.GRID_ID
-            from epdc_user_grid_relation r
-            where r.USER_ID=eu.ID
-            order by r.CREATED_TIME desc
-            limit 1
+        from epdc_user_grid_relation r
+        where r.USER_ID=eu.ID
+        and r.DEL_FLAG='0'
+        order by r.CREATED_TIME desc
+        limit 1
         )as gridId,
         (
-            select r.GRID
-            from epdc_user_grid_relation r
-            where r.USER_ID=eu.ID
-            order by r.CREATED_TIME desc
-            limit 1
+        select r.GRID
+        from epdc_user_grid_relation r
+        where r.USER_ID=eu.ID
+        and r.DEL_FLAG='0'
+        order by r.CREATED_TIME desc
+        limit 1
         )as grid
         FROM
         epdc_user eu
@@ -447,6 +449,7 @@
         (select r.GRID_ID
             from epdc_user_grid_relation r
             where r.USER_ID=eu.ID
+            and r.DEL_FLAG='0'
             order by r.CREATED_TIME desc
             limit 1
         )as gridId,
@@ -454,6 +457,7 @@
             select r.GRID
             from epdc_user_grid_relation r
             where r.USER_ID=eu.ID
+            and r.DEL_FLAG='0'
             order by r.CREATED_TIME desc
             limit 1
         )as grid