Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

CeDo

2021-06-04 eb3920d7d07bbe8c85ef41c0b7f05fb4073d6226

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

@@ -68,4 +68,19 @@
      </if>
    </select>

   <select id="gridMemberWorkWarning" parameterType="com.panzhihua.common.model.dtos.grid.EventGridMemberWainDTO" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogAdminVO">
      SELECT
         id,
         position_address,
         content,
         happen_at
      FROM
         event_grid_member_warn_log
      WHERE
         grid_member_id = #{gridMemberWainDTO.gridMemberId}
      <if test="gridMemberWainDTO.keyWord!=null and gridMemberWainDTO.keyWord!= &quot;&quot;">
         AND (content like concat(#{gridMemberWainDTO.keyWord},'%') or position_address like concat(#{gridMemberWainDTO.keyWord},'%'))
      </if>
   </select>

</mapper>