|
|
@ -233,12 +233,12 @@ |
|
|
|
eu.VILLAGE_NAME AS villageName, |
|
|
|
eu.DWELLING_PLACE AS dwellingPlace, |
|
|
|
'0' AS authenticatedFlag, |
|
|
|
SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',1) as streetName, |
|
|
|
SUBSTRING_INDEX(SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',2),'-',-1)as communityName, |
|
|
|
SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',-1) as gridName, |
|
|
|
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, |
|
|
|
eu.PARTY_FLAG AS partyFlag, |
|
|
|
epaf.CADRE_FLAG AS cadreFlag, |
|
|
|
eu.ALL_DEPT_NAMES AS completeName, |
|
|
|
eugr.ALL_DEPT_NAMES AS completeName, |
|
|
|
eugr.LEADER_FLAG AS leaderFlag, |
|
|
|
eut.TAG_NAME AS tagName |
|
|
|
FROM |
|
|
@ -247,7 +247,8 @@ |
|
|
|
LEFT JOIN epdc_user_tag_relation eutr ON eutr.USER_ID = eu.ID |
|
|
|
LEFT JOIN epdc_user_tag eut ON eut.ID = eutr.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 eugr.USER_ID = eu.ID |
|
|
|
WHERE |
|
|
|
eu.DEL_FLAG = '0' |
|
|
|
AND epaf.DEL_FLAG = '0' |
|
|
|