From 1b710e434b79fc0f6ee3157a1e8aefe783821ddf Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Sun, 29 Aug 2021 09:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-client-yushan                          |  2 +-
 epdc-cloud-commons-yushan                         |  2 +-
 epdc-cloud-parent-yushan                          |  2 +-
 .../esua/epdc/service/impl/UserServiceImpl.java   |  1 +
 .../src/main/resources/mapper/UserDao.xml         | 15 +++++++++++----
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index cc0e5d4..8894fa8 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit cc0e5d4a31687b9224edc53d7b8d6414e7005d6a
+Subproject commit 8894fa89091fef625786273e51561bc1bb4e8fce
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index f491284..31d32c8 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit f49128405cd591b9aab7f129df01518c5aea143e
+Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13
diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan
index 7d5b870..6c53fd9 160000
--- a/epdc-cloud-parent-yushan
+++ b/epdc-cloud-parent-yushan
@@ -1 +1 @@
-Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c
+Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 95c800c..ed09a6b 100644
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -459,6 +459,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     @DataSource(value = DataSourceNames.FIRST)
     public Result<EpdcUserInfoResultDTO> getInfoById(String id) {
+        EpdcUserInfoResultDTO user = baseDao.selectOneInfoById(id);
 
         return new Result<EpdcUserInfoResultDTO>().ok(baseDao.selectOneInfoById(id));
     }
diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
index b9f9a3d..eff21ce 100644
--- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
+++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
@@ -8,7 +8,7 @@
     </delete>
 
     <select id="selectOneInfoById" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO">
-         SELECT
+        SELECT
             eu.ID AS id,
             eu.NICKNAME AS nickname,
             eu.FACE_IMG AS faceImg,
@@ -19,13 +19,20 @@
             eu.ROAD AS road,
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE AS dwellingPlace,
-            eu.PARTY_FLAG AS partyFlag
+            eu.PARTY_FLAG AS partyFlag,
+            CASE
+                COUNT( ui.ID )
+                WHEN 0 THEN
+                    '0' ELSE '1'
+                END AS showIdentityFlag
         FROM
             epdc_user eu
-        Left Join (select * from  epdc_user_grid_relation  where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr
-            on(eu.id=eugr.USER_ID)
+                LEFT JOIN ( SELECT gr.ALL_DEPT_NAMES, gr.USER_ID FROM epdc_user_grid_relation gr WHERE gr.DEL_FLAG = '0' AND gr.USER_ID = #{id} ORDER BY gr.UPDATED_TIME DESC LIMIT 0, 1 ) eugr ON ( eu.id = eugr.USER_ID )
+                LEFT JOIN epdc_user_info ui ON eu.ID = ui.USER_ID
+                AND ui.DEL_FLAG = '0'
         WHERE
             eu.ID = #{id}
+          AND eu.DEL_FLAG = '0'
     </select>
     <select id="deleteByUnionId">
         DELETE