Merge branch 'test' into 'master'

罗元桥

2021-07-15 d2baab8c43dca88365dac6e98a95ceee644001e2

Merge branch 'test' into 'master'

修改bug

See merge request root/zhihuishequ!98

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -765,8 +765,6 @@
            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "), 0 ) AS yesEventSSPTotal  " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{screenEventDTO.communityId} ), 0 ) AS eventSSPTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{screenEventDTO.communityId} ), 0 ) AS yesEventSSPTotal  " +
            "FROM " +
            " `event` AS e " +
            " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " +