Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 2384c489bc788ee60d49a1a07bb8059f4a15352a

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

@@ -252,7 +252,7 @@
    List<EastPhotoTypeVO> countPub(@Param("communityId")Long communityId);

    @Select("SELECT t.name,COUNT(p.id) as num FROM com_act_easy_photo_type t LEFT JOIN com_act_easy_photo_type_relation r ON  t.id = r.easy_type_id " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 where p.community_id = #{communityId} " +
            "LEFT JOIN com_act_easy_photo p ON r.easy_id = p.id AND p.status = 4 and p.community_id = #{communityId} " +
            "GROUP BY t.name ")
    List<EastPhotoTypeVO> countApproved(@Param("communityId")Long communityId);