diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java index bd5663736..9f00ac3db 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java @@ -23,4 +23,11 @@ public class EpdcUserInfoResultDTO implements Serializable { private String isSignUp; + private String gridId; + private String gridName; + private String parentDeptIds; + private String parentDeptNames; + private String allDeptIds; + private String allDeptNames; + } 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 92aa028bb..0c56c1011 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 @@ -19,7 +19,13 @@ eu.ROAD AS road, eu.VILLAGE_NAME AS villageName, eu.DWELLING_PLACE AS dwellingPlace, - eu.PARTY_FLAG AS partyFlag + eu.PARTY_FLAG AS partyFlag, + eugr.GRID_ID AS gridId, + eugr.GRID AS gridName, + eugr.PARENT_DEPT_IDS AS parentDeptIds, + eugr.PARENT_DEPT_NAMES AS parentDeptNames, + eugr.ALL_DEPT_IDS AS allDeptIds, + eugr.ALL_DEPT_NAMES AS allDeptNames 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