fengxiang
2018-06-28 b77f77dae23be890dd98e03a8a9abffec9e3d94c
src/main/resources/mapper/DeviceMapper.xml
@@ -150,7 +150,7 @@
      WHERE
         mp.area_code = #{areaCode} 
         AND d.monitor_point_id = mp.id
      <if test="orgIds != null and orgIds.size &gt; 0">
      <if test="orgIds != null and orgIds.size() > 0">
         AND mp.organization_id IN
         <foreach  collection="orgIds" open="(" separator="," close=")" item="listItem">
            #{listItem}
@@ -172,7 +172,15 @@
      left join device_version dve on dev.device_version_id = dve.id
      <where>
      <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
         mpt.organization_id =  #{orgId}
         (
         1 > 1
         <if test="orgIds!=null and orgIds.size() > 0">
            or mpt.organization_id in
            <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
               #{tempOrgId,jdbcType=INTEGER}
            </foreach>
         </if>
         )
      </if>
         and dev.is_delete = 0
         <if test="devState!=null">
@@ -194,7 +202,15 @@
      left join device_version dve on dev.device_version_id = dve.id
      <where>
         <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
            mpt.organization_id =  #{orgId}
            (
            1 > 1
            <if test="orgIds!=null and orgIds.size() > 0">
               or mpt.organization_id in
               <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
                  #{tempOrgId,jdbcType=INTEGER}
               </foreach>
            </if>
            )
         </if>
         and dev.monitor_point_id = #{mpId}
         and dev.is_delete = 0
@@ -206,7 +222,15 @@
        left join device_version dve on dev.device_version_id = dve.id
      <where>
         <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
            mpt.organization_id = #{orgId,jdbcType=VARCHAR}
            (
            1 > 1
            <if test="orgIds!=null and orgIds.size() > 0">
               or mpt.organization_id in
               <foreach collection="orgIds" item="tempOrgId" open="(" close=")" separator=",">
                  #{tempOrgId,jdbcType=INTEGER}
               </foreach>
            </if>
            )
         </if>
         <![CDATA[
         AND dev.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}