From fbe9999744f19754b89ed7c71648becccfdea7ff Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 4 Dec 2019 15:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=9A=E5=91=98=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserDao.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 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 a21e5bcae..47135834d 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 @@ -203,12 +203,12 @@ eu.VILLAGE_NAME AS villageName, eu.DWELLING_PLACE as dwellingPlace, '1' as authenticatedFlag, - SUBSTRING_INDEX(eugr.ALL_DEPT_NAMES,'-',1) as streetName, - SUBSTRING_INDEX(SUBSTRING_INDEX(eugr.ALL_DEPT_NAMES,'-',2),'-',-1)as communityName, - SUBSTRING_INDEX(eugr.ALL_DEPT_NAMES,'-',-1) as gridName, + SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',1) as streetName, + SUBSTRING_INDEX(SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',2),'-',-1)as communityName, + SUBSTRING_INDEX(epm.ALL_DEPT_NAMES,'-',-1) as gridName, eu.PARTY_FLAG as partyFlag, epm.CADRE_FLAG as cadreFlag, - eugr.ALL_DEPT_NAMES as completeName, + eu.ALL_DEPT_NAMES as completeName, eugr.LEADER_FLAG as leaderFlag, eut.TAG_NAME as tagName FROM @@ -217,9 +217,7 @@ LEFT JOIN epdc_party_tag_relation eptr ON eptr.PARTY_ID = epm.ID LEFT JOIN epdc_user_tag eut ON eut.ID = eptr.TAG_ID AND eut.DEL_FLAG = '0' - /*LEFT JOIN epdc_user_grid_relation eugr on eugr.USER_ID = eu.ID*/ - LEFT JOIN (select * from epdc_user_grid_relation where USER_ID = #{userId} order by UPDATED_TIME desc limit 0,1) eugr - on eu.id=eugr.USER_ID + LEFT JOIN epdc_user_grid_relation eugr on eugr.USER_ID = eu.ID WHERE eu.DEL_FLAG = '0' AND epm.DEL_FLAG = '0'