Merge branch 'test' into 'master'

罗元桥

2021-08-15 239df6b32472882b4bd74fe97d9cc589c4f39baf

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/SysUserDOMapper.xml

@@ -69,6 +69,9 @@
            IFNULL(cauw.income_amount,0) as income_amount,
            IFNULL(cauw.available_amount,0) as available_amount,
            IFNULL(cauw.settlement_amount,0) as settlement_amount,
            IFNULL(caiu.integral_sum,0) as integral_sum,
            IFNULL(caiu.integral_available_sum,0) as integral_available_sum,
            IFNULL(caiu.integral_frozen_sum,0) as integral_frozen_sum,
            IF(u.id_card,1,2) as isRealNamed,
            u.create_at
        FROM
@@ -76,6 +79,7 @@
            LEFT JOIN com_mng_volunteer_mng v ON u.phone = v.phone
            LEFT JOIN com_act AS c ON c.community_id = u.community_id
            LEFT JOIN com_act_user_wallet as cauw on u.user_id = cauw.user_id and u.community_id = cauw.community_id
            LEFT JOIN com_act_integral_user as caiu on u.user_id = caiu.user_id and u.community_id = caiu.community_id
        WHERE
            u.community_id = #{loginUserInfoVO.communityId}
            AND u.type = 1