elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_hotfix' into dev_hotfix

dev_shibei_match
jianjun 4 years ago
parent
4f52fcc85d 8602ee9b21
commit
cc7bd3e2d2
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

2
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
View File

@ -498,7 +498,7 @@
icvol.VOLUNTEER_CATEGORY as volunteerCategoriesStr icvol.VOLUNTEER_CATEGORY as volunteerCategoriesStr
from user_base_info userbaseinfo from user_base_info userbaseinfo
inner join ic_resi_user icuser on (userbaseinfo.ID_NUM = icuser.ID_CARD and icuser.DEL_FLAG = '0') inner join ic_resi_user icuser on (userbaseinfo.ID_NUM = icuser.ID_CARD and icuser.DEL_FLAG = '0')
left join ic_volunteer icvol on (icuser.ID = icvol.IC_RESI_USER and icvol.DEL_FLAG = '0') inner join ic_volunteer icvol on (icuser.ID = icvol.IC_RESI_USER and icvol.DEL_FLAG = '0')
where userbaseinfo.DEL_FLAG = '0' where userbaseinfo.DEL_FLAG = '0'
and userbaseinfo.ID_NUM is not null and userbaseinfo.ID_NUM is not null
and userbaseinfo.USER_ID in and userbaseinfo.USER_ID in

Write Preview
Loading…
Cancel
Save