居民端获取用户信息接口新增党员亮身份标识字段

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit cc0e5d4a31687b9224edc53d7b8d6414e7005d6a
+Subproject commit 8894fa89091fef625786273e51561bc1bb4e8fce

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit f49128405cd591b9aab7f129df01518c5aea143e
+Subproject commit 31d32c81a8018a5c93745bcca1a538cc0bf59e13

epdc-cloud-parent-yushan

@@ -1 +1 @@
-Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c
+Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d

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));
     }

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
+                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 )
-            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