Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-24 153b891aea3fab7528d497e2ededf294fa016c3a

 src/main/resources/mapper/OrganizationMapper.xml

@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >

<mapper namespace="com.moral.mapper.OrganizationMapper" >

  <resultMap id="BaseResultMap" type="com.moral.entity.Organization" >

    <id column="id" property="id" jdbcType="INTEGER" />

    <result column="name" property="name" jdbcType="VARCHAR" />

    <result column="rank" property="rank" jdbcType="INTEGER" />

    <result column="province_code" property="provinceCode" jdbcType="INTEGER" />

    <result column="city_code" property="cityCode" jdbcType="INTEGER" />

    <result column="area_code" property="areaCode" jdbcType="INTEGER" />

    <result column="address" property="address" jdbcType="VARCHAR" />

    <result column="telephone" property="telephone" jdbcType="VARCHAR" />

    <result column="email" property="email" jdbcType="VARCHAR" />

    <result column="is_delete" property="isDelete" jdbcType="CHAR" />

    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />

    <result column="expire_time" property="expireTime" jdbcType="TIMESTAMP" />

    <result column="description" property="description" jdbcType="VARCHAR" />

  </resultMap>



<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.moral.mapper.OrganizationMapper">
   <select id="getOrganizationsByAreaName" resultType="com.moral.entity.Organization">
      SELECT
         o.* 
      FROM
         organization o,
         area a 
      <if test="cityName != null">

         ,city c 
      </if>

      WHERE
         o.area_code = a.area_code 
         AND a.area_name = #{areaName}
      <if test="cityName != null">

         AND c.city_name = #{cityName}

         AND o.city_code = c.city_code

      </if>

   </select>
</mapper>