Merge remote-tracking branch 'origin/dev_plugins' into dev_temp

5 years ago · f6a1c1f288
1 changed files with 0 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@ -228,7 +228,6 @@
            LEFT JOIN user_wechat uw ON uw.user_id = cs.user_id AND uw.del_flag = 0
        WHERE
            cs.del_flag = 0
-            AND cs.active_flag = 'active'
            AND cs.enable_flag = 'enable'
            AND
            <foreach collection="userIds" item="userId" separator="OR">