Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

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

@@ -31,4 +31,7 @@
            "JOIN com_act_discuss_option o ON d.id = o.discuss_id and d.id=#{id}\n" +
            "JOIN com_act_discuss_option_user ou ON o.id = ou.discuss_option_id and ou.user_id=#{loginUserId}")
    int selectHaveVote(@Param("id") Long id, @Param("loginUserId") Long loginUserId);

    @Select("select count(id) from com_act_discuss_option_user where discuss_option_id = #{discussOptionId} and user_id = #{userId}")
    int selectHaveVotes(@Param("discussOptionId") Long discussOptionId, @Param("userId") Long userId);
}