|
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
and a.source = #{p.source}
|
|
and a.source = #{p.source}
|
|
</if>
|
|
</if>
|
|
</where>
|
|
</where>
|
|
- 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
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
|
|
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
<if test="unitId != null and unitId != ''">
|
|
<if test="unitId != null and unitId != ''">
|
|
and a.unit_id = #{unitId}
|
|
and a.unit_id = #{unitId}
|
|
</if>
|
|
</if>
|
|
- order by a.name asc
|
|
|
|
|
|
+ order by CONVERT(REPLACE(a.name,'号',''),UNSIGNED) asc
|
|
</select>
|
|
</select>
|
|
<select id="selectHouseId" resultType="com.ruoyi.zdsz.domain.ZHouse">
|
|
<select id="selectHouseId" resultType="com.ruoyi.zdsz.domain.ZHouse">
|
|
select
|
|
select
|