@@ -32,7 +32,8 @@
<select id="getArea" resultType="com.ruoyi.zdsz.domain.vo.ZAreaVo">
select
a.id,
- a.name
+ a.name,
+ a.administrative
from z_area a
where a.del_flag = '0'
<if test="district != null and district != ''">
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null and areaId != ''">
and a.area_id = #{areaId}
</if>
- order by a.name asc
+ order by CONVERT(REPLACE(a.name,'栋',''),UNSIGNED) asc
</select>
<select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZBuildingVo">
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.area_id = #{p.areaId}
</where>
- order by b.name,a.name asc
+ order by b.name,CONVERT(REPLACE(a.name,'栋',''),UNSIGNED) asc
</mapper>
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.source = #{p.source}
- order by b.name,c.name,d.name,a.name asc
+ order by b.name,CONVERT(REPLACE(c.name,'栋',''),UNSIGNED),CONVERT(REPLACE(d.name,'单元',''),UNSIGNED),CONVERT(REPLACE(a.name,'号',''),UNSIGNED) asc
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="unitId != null and unitId != ''">
and a.unit_id = #{unitId}
+ order by CONVERT(REPLACE(a.name,'号',''),UNSIGNED) asc
<select id="selectHouseId" resultType="com.ruoyi.zdsz.domain.ZHouse">
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="buildingId != null and buildingId != ''">
and a.building_id = #{buildingId}
+ order by CONVERT(REPLACE(a.name,'单元',''),UNSIGNED) asc
<select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.building_id = #{p.buildingId}
- order by b.name,c.name,a.name asc
+ order by b.name,CONVERT(REPLACE(c.name,'栋',''),UNSIGNED),CONVERT(REPLACE(a.name,'单元',''),UNSIGNED) asc