Merge branch 'test' into 'master'

罗元桥

2021-07-15 2b020ad1e07a91524b496069e1a604b92ebbd7a3

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

@@ -360,4 +360,21 @@

   </select>

   <select id="getMapGridsListsByApp" resultType="com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO">
      <if test="type != null and type == 1">
         SELECT DISTINCT
         egmr.grid_community_id as gridId,
         ca.`name` AS gridName
         FROM
         event_grid_member_relation AS egmr
         LEFT JOIN com_act AS ca ON ca.community_id = egmr.grid_community_id
         WHERE
         grid_member_id = #{userId}
      </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}
      </if>
   </select>

</mapper>