|
|
|
@ -30,7 +30,7 @@
@@ -30,7 +30,7 @@
|
|
|
|
|
u.update_time, |
|
|
|
|
u.remarks |
|
|
|
|
FROM |
|
|
|
|
common_push_concern_fan cf JOIN sys_user u |
|
|
|
|
common_push_concern_fan cf JOIN (SELECT * FROM sys_user WHERE del_flag = 0) u |
|
|
|
|
ON |
|
|
|
|
<choose> |
|
|
|
|
<when test="map.dynamicJoinType == 1"> |
|
|
|
@ -41,7 +41,8 @@
@@ -41,7 +41,8 @@
|
|
|
|
|
</otherwise> |
|
|
|
|
</choose> |
|
|
|
|
<where> |
|
|
|
|
cf.del_flag = 0 AND u.status = 0 |
|
|
|
|
cf.del_flag = 0 |
|
|
|
|
AND u.status = 0 |
|
|
|
|
<if test="map.status != null and map.status != ''"> |
|
|
|
|
AND cf.status = #{map.status} |
|
|
|
|
</if> |
|
|
|
@ -86,7 +87,7 @@
@@ -86,7 +87,7 @@
|
|
|
|
|
u.update_time, |
|
|
|
|
u.remarks |
|
|
|
|
FROM |
|
|
|
|
common_push_concern_fan cf JOIN sys_user u |
|
|
|
|
common_push_concern_fan cf JOIN (SELECT * FROM sys_user WHERE del_flag = 0) u |
|
|
|
|
ON |
|
|
|
|
<choose> |
|
|
|
|
<when test="dynamicJoinType == 1"> |
|
|
|
@ -97,7 +98,8 @@
@@ -97,7 +98,8 @@
|
|
|
|
|
</otherwise> |
|
|
|
|
</choose> |
|
|
|
|
<where> |
|
|
|
|
cf.del_flag = 0 AND u.status = 0 |
|
|
|
|
cf.del_flag = 0 |
|
|
|
|
AND u.status = 0 |
|
|
|
|
AND cf.id = #{id} |
|
|
|
|
ORDER BY u.create_time ASC |
|
|
|
|
</where> |
|
|
|
@ -117,13 +119,13 @@
@@ -117,13 +119,13 @@
|
|
|
|
|
<when test="map.dynamicJoinType == 1"> |
|
|
|
|
AND concern_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf |
|
|
|
|
ON u.id = cf.fan_user_id |
|
|
|
|
LEFT JOIN common_push_blacklist b |
|
|
|
|
LEFT JOIN (SELECT * FROM common_push_blacklist WHERE del_flag = 0) b |
|
|
|
|
ON u.id = b.fan_user_id |
|
|
|
|
</when> |
|
|
|
|
<otherwise> |
|
|
|
|
AND fan_user_id = ${@com.cloud.kicc.common.security.util.SecurityUtils@getUser().id}) cf |
|
|
|
|
ON u.id = cf.concern_user_id |
|
|
|
|
LEFT JOIN common_push_blacklist b |
|
|
|
|
LEFT JOIN (SELECT * FROM common_push_blacklist WHERE del_flag = 0) b |
|
|
|
|
ON u.id = b.concern_user_id |
|
|
|
|
</otherwise> |
|
|
|
|
</choose> |
|
|
|
|