Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
 	<select id="selectAreaList" parameterType="com.inspect.metadata.area.domain.BaseDataArea" resultMap="BaseDataAreaResult">
         <include refid="selectAreaVo"/>
-        where d.del_flag = '0'
+        where d.del_flag = '0' and d.parent_id is not null
 		<if test="areaId != null and areaId != 0">
 			AND area_id = #{areaId}
 		</if>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select d.area_id, d.parent_id, d.relation_parent_id, d.ancestors, d.relation_ancestors, d.area_name, d.area_type, d.order_num, d.status, d.del_flag, d.create_by, d.create_time,d.device_type_code,d.area_addr,d.remark,d.area_code
 		,d.old_area_id, d.old_parent_id
 		from basedata_area d
-		where d.del_flag = '0'
+		where d.del_flag = '0' and d.relation_parent_id is not null
 		<if test="areaId != null and areaId != 0">
 			AND area_id = #{areaId}
 		</if>