From b74c2b6bc5b50225a7441fe333a418e6938b98c3 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 15 Jan 2020 18:21:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2CachingUserInfoDTOsql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml     | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 006d43d2d..284ca5116 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -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

From 7bc8f1153d451ff6c2db0e24f2adc047d73be526 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 15 Jan 2020 19:03:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?CachingUserInfoDTO=E4=B8=AD=E7=9A=84id?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAuserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java   | 3 +--
 .../main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java  | 3 +--
 .../epdc-user-server/src/main/resources/mapper/UserDao.xml     | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 4fcc65c04..4d4ccf485 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/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());
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java
index d082b68a9..81103fe09 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java
+++ b/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;
 
     /**
      * 昵称
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 284ca5116..43ff2f991 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/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"/>

From 5a9c8db7e647981006bc2bdbf52c796c43b4f79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 16 Jan 2020 10:12:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java
index e178ffe5f..6c3ccb3ec 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java
+++ b/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;
+
     /**
      * 手机号
      */