Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-04 202c08e4c835e4fa00452577d954025045f7961e

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

@@ -12,6 +12,7 @@
import org.apache.ibatis.annotations.Select;

import java.util.List;
import java.util.Map;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -67,6 +68,7 @@
            "u.nick_name, " +
            "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, " +
            "u.phone, " +
            "u.openid, " +
            "a.create_at,  " +
            "a.is_volunteer  " +
            "FROM " +
@@ -120,4 +122,7 @@
            " </if> " +
            " </script>")
    IPage<ActActivityPeopleListVO> getActActivityPeopleList(Page page,@Param("activityPeopleListDTO") ScreenActActivityPeopleListDTO activityPeopleListDTO);

    @Select("select openid from sys_user where user_id = #{userId}")
    Map<String,String> getUserOpenId(@Param("userId")Long userId);
}