Merge branch 'test' into 'master'

罗元桥

2021-07-15 b6781773a6f916279407d9087fcd9e2a76290dd4

Merge branch 'test' into 'master'

修改bug

See merge request root/zhihuishequ!103

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml

@@ -373,7 +373,14 @@
        </if>

        <if test="type != null and type == 2">
            select id as gridId,grid_name,grid_community_id AS gridName from event_grid_member_relation as egmr where grid_member_id = #{userId} and grid_community_id = #{communityId}
            SELECT
            egmr.grid_id,
            egd.grid_name,
            egd.grid_community_id
            FROM
            event_grid_member_relation AS egmr
            left join event_grid_data as egd on egd.id = egmr.grid_id
            where egmr.grid_member_id = #{userId} and egd.grid_community_id = #{communityId}
        </if>
    </select>