elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【用户管理】【过滤gridID为0的数据】-王公峰-2020-05-22

feature/dangjian
wanggongfeng 6 years ago
parent
074b6173f2
commit
7374233019
2 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
  2. 16
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

4
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
View File

@ -878,7 +878,7 @@
esua_epdc_user.epdc_user uu
LEFT JOIN (SELECT MIN( CREATED_TIME ) AS CREATED_TIME, USER_ID FROM esua_epdc_user.epdc_user_grid_relation WHERE DEL_FLAG = '0' GROUP BY USER_ID ) MINRELA ON MINRELA.USER_ID = uu.ID
LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(uu.DEPT_ID,RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(if(uu.DEPT_ID = 0,null,uu.DEPT_ID),RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
<include refid="joinCommunityStreet"></include>
LEFT JOIN (
@ -960,7 +960,7 @@
esua_epdc_user.epdc_user uu
LEFT JOIN (SELECT MIN( CREATED_TIME ) AS CREATED_TIME, USER_ID FROM esua_epdc_user.epdc_user_grid_relation WHERE DEL_FLAG = '0' GROUP BY USER_ID ) MINRELA ON MINRELA.USER_ID = uu.ID
LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION ON RELATION.USER_ID = MINRELA.USER_ID AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(uu.DEPT_ID,RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(if(uu.DEPT_ID = 0,null,uu.DEPT_ID),RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
<include refid="joinCommunityStreet"></include>
LEFT JOIN (

16
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
View File

@ -702,7 +702,7 @@
<if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
AND IFNULL(u.dept_id,RELATION.GRID_ID) IN
AND IFNULL(if(u.dept_id = 0 ,null,u.dept_id),RELATION.GRID_ID) IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
@ -715,7 +715,7 @@
OR find_in_set(#{communityId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
</if>
<if test="gridId != '' and gridId != null">
and (IFNULL(u.dept_id,RELATION.GRID_ID) = #{gridId}
and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
OR find_in_set(#{gridId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
</if>
and HISTORY.AUTHENTICATED_TYPE='0' and HISTORY.AUTHENTICATED_FLAG = '2'
@ -768,7 +768,7 @@
<if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
AND IFNULL(u.dept_id,RELATION.GRID_ID) IN
AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
@ -781,7 +781,7 @@
OR find_in_set(#{communityId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
</if>
<if test="gridId != '' and gridId != null">
and (IFNULL(u.dept_id,RELATION.GRID_ID) = #{gridId}
and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
OR find_in_set(#{gridId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
</if>
and HISTORY.id is null
@ -835,7 +835,7 @@
<if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
AND IFNULL(u.dept_id,RELATION.GRID_ID) IN
AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
@ -848,7 +848,7 @@
OR find_in_set(#{communityId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
</if>
<if test="gridId != '' and gridId != null">
and (IFNULL(u.dept_id,RELATION.GRID_ID) = #{gridId}
and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
OR find_in_set(#{gridId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
</if>
and HISTORY.AUTHENTICATED_TYPE='0' and HISTORY.AUTHENTICATED_FLAG = '0'
@ -938,7 +938,7 @@
<if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
AND IFNULL(u.dept_id,RELATION.GRID_ID) IN
AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
<foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
@ -951,7 +951,7 @@
OR find_in_set(#{communityId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
</if>
<if test="gridId != '' and gridId != null">
and (IFNULL(u.dept_id,RELATION.GRID_ID) = #{gridId}
and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
OR find_in_set(#{gridId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
</if>
and HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '0'

Write Preview
Loading…
Cancel
Save