diff --git a/src/main/resources/mybatis/mapper/house/house-mapper.xml b/src/main/resources/mybatis/mapper/house/house-mapper.xml
index 386544b..494d10b 100644
--- a/src/main/resources/mybatis/mapper/house/house-mapper.xml
+++ b/src/main/resources/mybatis/mapper/house/house-mapper.xml
@@ -187,125 +187,122 @@
 
     <!-- 新增房院管理 -->
     <insert id="save" parameterType="map">
-        INSERT INTO house_house(
-            house_id,
-            street,
-            street_name,
-            community,
-            community_name,
-            residential_id,
-            residential_name,
-            building_id,
-            building_name,
-            affiliation_unit,
-            affiliation_floors,
-            house_num,
-            category_id,
-            category_name,
-            nature_id,
-            nature_name,
-            type_id,
-            type_name,
-            structure_id,
-            structure_name,
-            building_purpose_id,
-            building_purpose_name,
-            room_num,
-            room_area,
-            room_use_id,
-            room_use_name,
-            danger_id,
-            danger_name,
-            certificate_num,
-            registration_date,
-            affiliated_unit,
-            is_rental,
-            is_vacant,
-            lodge_type_id,
-            lodge_type_name,
-            rental_purposes,
-            homeowner,
-            document_id,
-            document_name,
-            document_num,
-            phone,
-            custodian,
-            custodian_document_id,
-            custodian_document_name,
-            custodian_document_num,
-            custodian_phone,
-            relationship_homeowner,
-            creator,
-            gmt_create,
-            modifier,
-            gmt_modified,
-            is_delete
-        ) VALUES(
-            #{houseId},
-            #{street},
-            #{streetName},
-            #{community},
-            #{communityName},
-            #{residentialId},
-            #{residentialName},
-            #{buildingId},
-            #{buildingName},
-            #{affiliationUnit},
-            #{affiliationFloors},
-            #{houseNum},
-            #{categoryId},
-            #{categoryName},
-            #{natureId},
-            #{natureName},
-            #{typeId},
-            #{typeName},
-            #{structureId},
-            #{structureName},
-            #{buildingPurposeId},
-            #{buildingPurposeName},
-            #{roomNum},
-            #{roomArea},
-            #{roomUseId},
-            #{roomUseName},
-            #{dangerId},
-            #{dangerName},
-            #{certificateNum},
-            #{registrationDate},
-            #{affiliatedUnit},
-            #{isRental},
-            #{isVacant},
-            #{lodgeTypeId},
-            #{lodgeTypeName},
-            #{rentalPurposes},
-            #{homeowner},
-            #{documentId},
-            #{documentName},
-            #{documentNum},
-            #{phone},
-            #{custodian},
-            #{custodianDocumentId},
-            #{custodianDocumentName},
-            #{custodianDocumentNum},
-            #{custodianPhone},
-            #{relationshipHomeowner},
-            #{creator},
-            #{gmtCreate},
-            #{modifier},
-            #{gmtModified},
-            #{isDelete}
-        )
+        INSERT INTO house_house(house_id,
+                                street,
+                                street_name,
+                                community,
+                                community_name,
+                                residential_id,
+                                residential_name,
+                                building_id,
+                                building_name,
+                                affiliation_unit,
+                                affiliation_floors,
+                                house_num,
+                                category_id,
+                                category_name,
+                                nature_id,
+                                nature_name,
+                                type_id,
+                                type_name,
+                                structure_id,
+                                structure_name,
+                                building_purpose_id,
+                                building_purpose_name,
+                                room_num,
+                                room_area,
+                                room_use_id,
+                                room_use_name,
+                                danger_id,
+                                danger_name,
+                                certificate_num,
+                                registration_date,
+                                affiliated_unit,
+                                is_rental,
+                                is_vacant,
+                                lodge_type_id,
+                                lodge_type_name,
+                                rental_purposes,
+                                homeowner,
+                                document_id,
+                                document_name,
+                                document_num,
+                                phone,
+                                custodian,
+                                custodian_document_id,
+                                custodian_document_name,
+                                custodian_document_num,
+                                custodian_phone,
+                                relationship_homeowner,
+                                creator,
+                                gmt_create,
+                                modifier,
+                                gmt_modified,
+                                is_delete)
+        VALUES (#{houseId},
+                #{street},
+                #{streetName},
+                #{community},
+                #{communityName},
+                #{residentialId},
+                #{residentialName},
+                #{buildingId},
+                #{buildingName},
+                #{affiliationUnit},
+                #{affiliationFloors},
+                #{houseNum},
+                #{categoryId},
+                #{categoryName},
+                #{natureId},
+                #{natureName},
+                #{typeId},
+                #{typeName},
+                #{structureId},
+                #{structureName},
+                #{buildingPurposeId},
+                #{buildingPurposeName},
+                #{roomNum},
+                #{roomArea},
+                #{roomUseId},
+                #{roomUseName},
+                #{dangerId},
+                #{dangerName},
+                #{certificateNum},
+                #{registrationDate},
+                #{affiliatedUnit},
+                #{isRental},
+                #{isVacant},
+                #{lodgeTypeId},
+                #{lodgeTypeName},
+                #{rentalPurposes},
+                #{homeowner},
+                #{documentId},
+                #{documentName},
+                #{documentNum},
+                #{phone},
+                #{custodian},
+                #{custodianDocumentId},
+                #{custodianDocumentName},
+                #{custodianDocumentNum},
+                #{custodianPhone},
+                #{relationshipHomeowner},
+                #{creator},
+                #{gmtCreate},
+                #{modifier},
+                #{gmtModified},
+                #{isDelete})
     </insert>
 
     <!-- 删除房院管理 -->
     <update id="remove" parameterType="map">
         UPDATE
-            house_house
+        house_house
         SET
-            gmt_modified = #{gmtModified},
-            modifier = #{modifier},
-            is_delete = 1
+        gmt_modified = #{gmtModified},
+        modifier = #{modifier},
+        is_delete = 1
         WHERE
-            house_id IN
+        house_id IN
         <foreach collection="houseIds" index="index" open="(" separator="," close=")">
             #{houseIds[${index}]}
         </foreach>
@@ -314,9 +311,9 @@
     <!-- 删除房院管理（物理） -->
     <update id="delete" parameterType="map">
         DELETE FROM
-            house_house
+        house_house
         WHERE
-            house_id IN
+        house_id IN
         <foreach collection="houseIds" index="index" open="(" separator="," close=")">
             #{houseIds[${index}]}
         </foreach>
@@ -325,7 +322,7 @@
     <!-- 修改房院管理 -->
     <update id="update" parameterType="map">
         UPDATE
-            house_house
+        house_house
         SET
         <if test="street != null and street != ''">
             street = #{street},
@@ -465,264 +462,264 @@
         <if test="relationshipHomeowner != null and relationshipHomeowner != ''">
             relationship_homeowner = #{relationshipHomeowner},
         </if>
-            gmt_modified = #{gmtModified},
-            modifier = #{modifier},
-            house_id = house_id
+        gmt_modified = #{gmtModified},
+        modifier = #{modifier},
+        house_id = house_id
         WHERE
-            house_id = #{houseId}
+        house_id = #{houseId}
     </update>
 
     <!-- 房院管理详情 -->
     <select id="get" parameterType="map" resultMap="houseDTO">
         SELECT
-            t1.street,
-            t1.street_name,
-            t1.community,
-            t1.community_name,
-            t1.residential_id,
-            t1.residential_name,
-            t1.building_id,
-            t1.building_name,
-            t1.affiliation_unit,
-            t1.affiliation_floors,
-            t1.house_num,
-            t1.category_id,
-            t1.category_name,
-            t1.nature_id,
-            t1.nature_name,
-            t1.type_id,
-            t1.type_name,
-            t1.structure_id,
-            t1.structure_name,
-            t1.building_purpose_id,
-            t1.building_purpose_name,
-            t1.room_num,
-            t1.room_area,
-            t1.room_use_id,
-            t1.room_use_name,
-            t1.danger_id,
-            t1.danger_name,
-            t1.certificate_num,
-            t1.registration_date,
-            t1.affiliated_unit,
-            t1.is_rental,
-            t1.is_vacant,
-            t1.lodge_type_id,
-            t1.lodge_type_name,
-            t1.rental_purposes,
-            t1.homeowner,
-            t1.document_id,
-            t1.document_name,
-            t1.document_num,
-            t1.phone,
-            t1.custodian,
-            t1.custodian_document_id,
-            t1.custodian_document_name,
-            t1.custodian_document_num,
-            t1.custodian_phone,
-            t1.relationship_homeowner,
-            t1.house_id,
-            t1.creator
+        t1.street,
+        t1.street_name,
+        t1.community,
+        t1.community_name,
+        t1.residential_id,
+        t1.residential_name,
+        t1.building_id,
+        t1.building_name,
+        t1.affiliation_unit,
+        t1.affiliation_floors,
+        t1.house_num,
+        t1.category_id,
+        t1.category_name,
+        t1.nature_id,
+        t1.nature_name,
+        t1.type_id,
+        t1.type_name,
+        t1.structure_id,
+        t1.structure_name,
+        t1.building_purpose_id,
+        t1.building_purpose_name,
+        t1.room_num,
+        t1.room_area,
+        t1.room_use_id,
+        t1.room_use_name,
+        t1.danger_id,
+        t1.danger_name,
+        t1.certificate_num,
+        t1.registration_date,
+        t1.affiliated_unit,
+        t1.is_rental,
+        t1.is_vacant,
+        t1.lodge_type_id,
+        t1.lodge_type_name,
+        t1.rental_purposes,
+        t1.homeowner,
+        t1.document_id,
+        t1.document_name,
+        t1.document_num,
+        t1.phone,
+        t1.custodian,
+        t1.custodian_document_id,
+        t1.custodian_document_name,
+        t1.custodian_document_num,
+        t1.custodian_phone,
+        t1.relationship_homeowner,
+        t1.house_id,
+        t1.creator
         FROM
-            house_house t1
+        house_house t1
         WHERE
-            t1.is_delete = 0
-            <if test="houseId != null and houseId != ''">
-        AND
+        t1.is_delete = 0
+        <if test="houseId != null and houseId != ''">
+            AND
             t1.house_id = #{houseId}
-            </if>
+        </if>
     </select>
 
     <!-- 房院管理详情 -->
     <select id="getBO" parameterType="map" resultMap="houseBO">
         SELECT
-            t1.house_id,
-            t1.street,
-            t1.street_name,
-            t1.community,
-            t1.community_name,
-            t1.residential_id,
-            t1.residential_name,
-            t1.building_id,
-            t1.building_name,
-            t1.affiliation_unit,
-            t1.affiliation_floors,
-            t1.house_num,
-            t1.category_id,
-            t1.category_name,
-            t1.nature_id,
-            t1.nature_name,
-            t1.type_id,
-            t1.type_name,
-            t1.structure_id,
-            t1.structure_name,
-            t1.building_purpose_id,
-            t1.building_purpose_name,
-            t1.room_num,
-            t1.room_area,
-            t1.room_use_id,
-            t1.room_use_name,
-            t1.danger_id,
-            t1.danger_name,
-            t1.certificate_num,
-            t1.registration_date,
-            t1.affiliated_unit,
-            t1.is_rental,
-            t1.is_vacant,
-            t1.lodge_type_id,
-            t1.lodge_type_name,
-            t1.rental_purposes,
-            t1.homeowner,
-            t1.document_id,
-            t1.document_name,
-            t1.document_num,
-            t1.phone,
-            t1.custodian,
-            t1.custodian_document_id,
-            t1.custodian_document_name,
-            t1.custodian_document_num,
-            t1.custodian_phone,
-            t1.relationship_homeowner,
-            t1.creator,
-            t1.gmt_create,
-            t1.modifier,
-            t1.gmt_modified,
-            t1.is_delete
+        t1.house_id,
+        t1.street,
+        t1.street_name,
+        t1.community,
+        t1.community_name,
+        t1.residential_id,
+        t1.residential_name,
+        t1.building_id,
+        t1.building_name,
+        t1.affiliation_unit,
+        t1.affiliation_floors,
+        t1.house_num,
+        t1.category_id,
+        t1.category_name,
+        t1.nature_id,
+        t1.nature_name,
+        t1.type_id,
+        t1.type_name,
+        t1.structure_id,
+        t1.structure_name,
+        t1.building_purpose_id,
+        t1.building_purpose_name,
+        t1.room_num,
+        t1.room_area,
+        t1.room_use_id,
+        t1.room_use_name,
+        t1.danger_id,
+        t1.danger_name,
+        t1.certificate_num,
+        t1.registration_date,
+        t1.affiliated_unit,
+        t1.is_rental,
+        t1.is_vacant,
+        t1.lodge_type_id,
+        t1.lodge_type_name,
+        t1.rental_purposes,
+        t1.homeowner,
+        t1.document_id,
+        t1.document_name,
+        t1.document_num,
+        t1.phone,
+        t1.custodian,
+        t1.custodian_document_id,
+        t1.custodian_document_name,
+        t1.custodian_document_num,
+        t1.custodian_phone,
+        t1.relationship_homeowner,
+        t1.creator,
+        t1.gmt_create,
+        t1.modifier,
+        t1.gmt_modified,
+        t1.is_delete
         FROM
-            house_house t1
+        house_house t1
         WHERE
-            t1.is_delete = 0
-            <if test="houseId != null and houseId != ''">
-        AND
+        t1.is_delete = 0
+        <if test="houseId != null and houseId != ''">
+            AND
             t1.house_id = #{houseId}
-            </if>
+        </if>
     </select>
 
     <!-- 房院管理详情 -->
     <select id="getPO" parameterType="map" resultMap="housePO">
         SELECT
-            t1.house_id,
-            t1.street,
-            t1.street_name,
-            t1.community,
-            t1.community_name,
-            t1.residential_id,
-            t1.residential_name,
-            t1.building_id,
-            t1.building_name,
-            t1.affiliation_unit,
-            t1.affiliation_floors,
-            t1.house_num,
-            t1.category_id,
-            t1.category_name,
-            t1.nature_id,
-            t1.nature_name,
-            t1.type_id,
-            t1.type_name,
-            t1.structure_id,
-            t1.structure_name,
-            t1.building_purpose_id,
-            t1.building_purpose_name,
-            t1.room_num,
-            t1.room_area,
-            t1.room_use_id,
-            t1.room_use_name,
-            t1.danger_id,
-            t1.danger_name,
-            t1.certificate_num,
-            t1.registration_date,
-            t1.affiliated_unit,
-            t1.is_rental,
-            t1.is_vacant,
-            t1.lodge_type_id,
-            t1.lodge_type_name,
-            t1.rental_purposes,
-            t1.homeowner,
-            t1.document_id,
-            t1.document_name,
-            t1.document_num,
-            t1.phone,
-            t1.custodian,
-            t1.custodian_document_id,
-            t1.custodian_document_name,
-            t1.custodian_document_num,
-            t1.custodian_phone,
-            t1.relationship_homeowner,
-            t1.creator,
-            t1.gmt_create,
-            t1.modifier,
-            t1.gmt_modified,
-            t1.is_delete
+        t1.house_id,
+        t1.street,
+        t1.street_name,
+        t1.community,
+        t1.community_name,
+        t1.residential_id,
+        t1.residential_name,
+        t1.building_id,
+        t1.building_name,
+        t1.affiliation_unit,
+        t1.affiliation_floors,
+        t1.house_num,
+        t1.category_id,
+        t1.category_name,
+        t1.nature_id,
+        t1.nature_name,
+        t1.type_id,
+        t1.type_name,
+        t1.structure_id,
+        t1.structure_name,
+        t1.building_purpose_id,
+        t1.building_purpose_name,
+        t1.room_num,
+        t1.room_area,
+        t1.room_use_id,
+        t1.room_use_name,
+        t1.danger_id,
+        t1.danger_name,
+        t1.certificate_num,
+        t1.registration_date,
+        t1.affiliated_unit,
+        t1.is_rental,
+        t1.is_vacant,
+        t1.lodge_type_id,
+        t1.lodge_type_name,
+        t1.rental_purposes,
+        t1.homeowner,
+        t1.document_id,
+        t1.document_name,
+        t1.document_num,
+        t1.phone,
+        t1.custodian,
+        t1.custodian_document_id,
+        t1.custodian_document_name,
+        t1.custodian_document_num,
+        t1.custodian_phone,
+        t1.relationship_homeowner,
+        t1.creator,
+        t1.gmt_create,
+        t1.modifier,
+        t1.gmt_modified,
+        t1.is_delete
         FROM
-            house_house t1
+        house_house t1
         WHERE
-            t1.is_delete = 0
-            <if test="houseId != null and houseId != ''">
-        AND
+        t1.is_delete = 0
+        <if test="houseId != null and houseId != ''">
+            AND
             t1.house_id = #{houseId}
-            </if>
+        </if>
     </select>
 
     <!-- 房院管理列表 -->
     <select id="list" parameterType="map" resultMap="houseDTO">
         SELECT
-            t1.house_id,
-            t1.street,
-            t1.street_name,
-            t1.community,
-            t1.community_name,
-            t1.residential_id,
-            t1.residential_name,
-            t1.building_id,
-            t1.building_name,
-            t1.affiliation_unit,
-            t1.affiliation_floors,
-            t1.house_num,
-            t1.category_id,
-            t1.category_name,
-            t1.nature_id,
-            t1.nature_name,
-            t1.type_id,
-            t1.type_name,
-            t1.structure_id,
-            t1.structure_name,
-            t1.building_purpose_id,
-            t1.building_purpose_name,
-            t1.room_num,
-            t1.room_area,
-            t1.room_use_id,
-            t1.room_use_name,
-            t1.danger_id,
-            t1.danger_name,
-            t1.certificate_num,
-            t1.registration_date,
-            t1.affiliated_unit,
-            t1.is_rental,
-            t1.is_vacant,
-            t1.lodge_type_id,
-            t1.lodge_type_name,
-            t1.rental_purposes,
-            t1.homeowner,
-            t1.document_id,
-            t1.document_name,
-            t1.document_num,
-            t1.phone,
-            t1.custodian,
-            t1.custodian_document_id,
-            t1.custodian_document_name,
-            t1.custodian_document_num,
-            t1.custodian_phone,
-            t1.relationship_homeowner,
-            t1.creator,
-            t1.gmt_create,
-            t1.modifier,
-            t1.gmt_modified,
-            t1.is_delete,
-            1
+        t1.house_id,
+        t1.street,
+        t1.street_name,
+        t1.community,
+        t1.community_name,
+        t1.residential_id,
+        t1.residential_name,
+        t1.building_id,
+        t1.building_name,
+        t1.affiliation_unit,
+        t1.affiliation_floors,
+        t1.house_num,
+        t1.category_id,
+        t1.category_name,
+        t1.nature_id,
+        t1.nature_name,
+        t1.type_id,
+        t1.type_name,
+        t1.structure_id,
+        t1.structure_name,
+        t1.building_purpose_id,
+        t1.building_purpose_name,
+        t1.room_num,
+        t1.room_area,
+        t1.room_use_id,
+        t1.room_use_name,
+        t1.danger_id,
+        t1.danger_name,
+        t1.certificate_num,
+        t1.registration_date,
+        t1.affiliated_unit,
+        t1.is_rental,
+        t1.is_vacant,
+        t1.lodge_type_id,
+        t1.lodge_type_name,
+        t1.rental_purposes,
+        t1.homeowner,
+        t1.document_id,
+        t1.document_name,
+        t1.document_num,
+        t1.phone,
+        t1.custodian,
+        t1.custodian_document_id,
+        t1.custodian_document_name,
+        t1.custodian_document_num,
+        t1.custodian_phone,
+        t1.relationship_homeowner,
+        t1.creator,
+        t1.gmt_create,
+        t1.modifier,
+        t1.gmt_modified,
+        t1.is_delete,
+        1
         FROM
-            house_house t1
+        house_house t1
         WHERE
-            t1.is_delete = 0
+        t1.is_delete = 0
         <if test="creator != null and creator != ''">
             AND t1.creator = #{creator}
         </if>
@@ -766,12 +763,12 @@
             AND is_vacant = #{isVacant}
         </if>
         <if test="keywords != null and keywords != ''">
-        AND (
+            AND (
             t1.house_num LIKE CONCAT('%', #{keywords}, '%')
-        )
+            )
         </if>
         <if test="startTime != null and startTime != ''">
-        AND
+            AND
             LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
@@ -779,101 +776,101 @@
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="houseIds != null and houseIds.size > 0">
-        AND
+            AND
             t1.house_id IN
             <foreach collection="houseIds" index="index" open="(" separator="," close=")">
                 #{houseIds[${index}]}
             </foreach>
         </if>
         <if test="populationInfoId != null and populationInfoId != ''">
-        AND
+            AND
             t1.house_id IN (
-                SELECT
-                    hp.house_id
-                FROM
-                    house_population hp
-                WHERE
-                    hp.population_info_id = #{populationInfoId}
+            SELECT
+            hp.house_id
+            FROM
+            house_population hp
+            WHERE
+            hp.population_info_id = #{populationInfoId}
             )
         </if>
-        ORDER BY affiliation_unit, affiliation_floors, house_num ASC
+        ORDER BY (affiliation_unit + 0), (affiliation_floors + 0), (house_num + 0) ASC
     </select>
 
     <!-- 房院管理列表 -->
     <select id="listBO" parameterType="map" resultMap="houseBO">
         SELECT
-            t1.house_id,
-            t1.street,
-            t1.street_name,
-            t1.community,
-            t1.community_name,
-            t1.residential_id,
-            t1.residential_name,
-            t1.building_id,
-            t1.building_name,
-            t1.affiliation_unit,
-            t1.affiliation_floors,
-            t1.house_num,
-            t1.category_id,
-            t1.category_name,
-            t1.nature_id,
-            t1.nature_name,
-            t1.type_id,
-            t1.type_name,
-            t1.structure_id,
-            t1.structure_name,
-            t1.building_purpose_id,
-            t1.building_purpose_name,
-            t1.room_num,
-            t1.room_area,
-            t1.room_use_id,
-            t1.room_use_name,
-            t1.danger_id,
-            t1.danger_name,
-            t1.certificate_num,
-            t1.registration_date,
-            t1.affiliated_unit,
-            t1.is_rental,
-            t1.is_vacant,
-            t1.lodge_type_id,
-            t1.lodge_type_name,
-            t1.rental_purposes,
-            t1.homeowner,
-            t1.document_id,
-            t1.document_name,
-            t1.document_num,
-            t1.phone,
-            t1.custodian,
-            t1.custodian_document_id,
-            t1.custodian_document_name,
-            t1.custodian_document_num,
-            t1.custodian_phone,
-            t1.relationship_homeowner,
-            t1.creator,
-            t1.gmt_create,
-            t1.modifier,
-            t1.gmt_modified,
-            t1.is_delete
+        t1.house_id,
+        t1.street,
+        t1.street_name,
+        t1.community,
+        t1.community_name,
+        t1.residential_id,
+        t1.residential_name,
+        t1.building_id,
+        t1.building_name,
+        t1.affiliation_unit,
+        t1.affiliation_floors,
+        t1.house_num,
+        t1.category_id,
+        t1.category_name,
+        t1.nature_id,
+        t1.nature_name,
+        t1.type_id,
+        t1.type_name,
+        t1.structure_id,
+        t1.structure_name,
+        t1.building_purpose_id,
+        t1.building_purpose_name,
+        t1.room_num,
+        t1.room_area,
+        t1.room_use_id,
+        t1.room_use_name,
+        t1.danger_id,
+        t1.danger_name,
+        t1.certificate_num,
+        t1.registration_date,
+        t1.affiliated_unit,
+        t1.is_rental,
+        t1.is_vacant,
+        t1.lodge_type_id,
+        t1.lodge_type_name,
+        t1.rental_purposes,
+        t1.homeowner,
+        t1.document_id,
+        t1.document_name,
+        t1.document_num,
+        t1.phone,
+        t1.custodian,
+        t1.custodian_document_id,
+        t1.custodian_document_name,
+        t1.custodian_document_num,
+        t1.custodian_phone,
+        t1.relationship_homeowner,
+        t1.creator,
+        t1.gmt_create,
+        t1.modifier,
+        t1.gmt_modified,
+        t1.is_delete
         FROM
-            house_house t1
+        house_house t1
         WHERE
-            t1.is_delete = 0
+        t1.is_delete = 0
         <if test="keywords != null and keywords != ''">
-        AND (
+            AND (
             <!-- 这里添加其他条件 -->
             t1.id LIKE CONCAT('%', #{keywords}, '%')
-        )
+            )
         </if>
         <if test="startTime != null and startTime != ''">
-        AND
+            AND
             LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-        AND
+            AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="houseIds != null and houseIds.size > 0">
-        AND
+            AND
             t1.house_id IN
             <foreach collection="houseIds" index="index" open="(" separator="," close=")">
                 #{houseIds[${index}]}
@@ -884,78 +881,78 @@
     <!-- 房院管理列表 -->
     <select id="listPO" parameterType="map" resultMap="housePO">
         SELECT
-            t1.house_id,
-            t1.street,
-            t1.street_name,
-            t1.community,
-            t1.community_name,
-            t1.residential_id,
-            t1.residential_name,
-            t1.building_id,
-            t1.building_name,
-            t1.affiliation_unit,
-            t1.affiliation_floors,
-            t1.house_num,
-            t1.category_id,
-            t1.category_name,
-            t1.nature_id,
-            t1.nature_name,
-            t1.type_id,
-            t1.type_name,
-            t1.structure_id,
-            t1.structure_name,
-            t1.building_purpose_id,
-            t1.building_purpose_name,
-            t1.room_num,
-            t1.room_area,
-            t1.room_use_id,
-            t1.room_use_name,
-            t1.danger_id,
-            t1.danger_name,
-            t1.certificate_num,
-            t1.registration_date,
-            t1.affiliated_unit,
-            t1.is_rental,
-            t1.is_vacant,
-            t1.lodge_type_id,
-            t1.lodge_type_name,
-            t1.rental_purposes,
-            t1.homeowner,
-            t1.document_id,
-            t1.document_name,
-            t1.document_num,
-            t1.phone,
-            t1.custodian,
-            t1.custodian_document_id,
-            t1.custodian_document_name,
-            t1.custodian_document_num,
-            t1.custodian_phone,
-            t1.relationship_homeowner,
-            t1.creator,
-            t1.gmt_create,
-            t1.modifier,
-            t1.gmt_modified,
-            t1.is_delete
+        t1.house_id,
+        t1.street,
+        t1.street_name,
+        t1.community,
+        t1.community_name,
+        t1.residential_id,
+        t1.residential_name,
+        t1.building_id,
+        t1.building_name,
+        t1.affiliation_unit,
+        t1.affiliation_floors,
+        t1.house_num,
+        t1.category_id,
+        t1.category_name,
+        t1.nature_id,
+        t1.nature_name,
+        t1.type_id,
+        t1.type_name,
+        t1.structure_id,
+        t1.structure_name,
+        t1.building_purpose_id,
+        t1.building_purpose_name,
+        t1.room_num,
+        t1.room_area,
+        t1.room_use_id,
+        t1.room_use_name,
+        t1.danger_id,
+        t1.danger_name,
+        t1.certificate_num,
+        t1.registration_date,
+        t1.affiliated_unit,
+        t1.is_rental,
+        t1.is_vacant,
+        t1.lodge_type_id,
+        t1.lodge_type_name,
+        t1.rental_purposes,
+        t1.homeowner,
+        t1.document_id,
+        t1.document_name,
+        t1.document_num,
+        t1.phone,
+        t1.custodian,
+        t1.custodian_document_id,
+        t1.custodian_document_name,
+        t1.custodian_document_num,
+        t1.custodian_phone,
+        t1.relationship_homeowner,
+        t1.creator,
+        t1.gmt_create,
+        t1.modifier,
+        t1.gmt_modified,
+        t1.is_delete
         FROM
-            house_house t1
+        house_house t1
         WHERE
-            t1.is_delete = 0
+        t1.is_delete = 0
         <if test="keywords != null and keywords != ''">
-        AND (
+            AND (
             <!-- 这里添加其他条件 -->
             t1.id LIKE CONCAT('%', #{keywords}, '%')
-        )
+            )
         </if>
         <if test="startTime != null and startTime != ''">
-        AND
+            AND
             LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-        AND
+            AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="houseIds != null and houseIds.size > 0">
-        AND
+            AND
             t1.house_id IN
             <foreach collection="houseIds" index="index" open="(" separator="," close=")">
                 #{houseIds[${index}]}
@@ -965,30 +962,27 @@
 
     <!-- 房院管理统计  -->
     <select id="count" parameterType="map" resultType="Integer">
-        SELECT
-            COUNT(*)
-        FROM
-            house_house t1
-        WHERE
-            t1.is_delete = 0
+        SELECT COUNT(*)
+        FROM house_house t1
+        WHERE t1.is_delete = 0
     </select>
 
     <!-- 以房找人列表 -->
     <select id="findPopulation" parameterType="map" resultMap="populationDTO">
         SELECT
-            t2.population_id,
-            t2.house_id,
-            t2.population_info_id,
-            t2.name,
-            t2.card_num,
-            t2.phone,
-            t2.bind_time,
-            t2.creator,
-            t2.gmt_create,
-            t2.modifier,
-            t2.gmt_modified,
-            t2.is_delete,
-            1
+        t2.population_id,
+        t2.house_id,
+        t2.population_info_id,
+        t2.name,
+        t2.card_num,
+        t2.phone,
+        t2.bind_time,
+        t2.creator,
+        t2.gmt_create,
+        t2.modifier,
+        t2.gmt_modified,
+        t2.is_delete,
+        1
         FROM
         house_house t1 INNER JOIN house_population t2 ON t1.house_id = t2.house_id
         WHERE
@@ -1057,19 +1051,19 @@
 
     <select id="listForAll" parameterType="map" resultMap="houseDTO">
         SELECT
-            t1.house_id,
-            t1.building_id,
-            t1.affiliation_unit,
-            t1.affiliation_floors,
-            t1.house_num,
-            t1.creator,
-            t1.gmt_create,
-            COUNT(t2.house_id) as count,
-            1
+        t1.house_id,
+        t1.building_id,
+        t1.affiliation_unit,
+        t1.affiliation_floors,
+        t1.house_num,
+        t1.creator,
+        t1.gmt_create,
+        COUNT(t2.house_id) as count,
+        1
         FROM
-            house_house t1 LEFT JOIN house_population t2 ON t1.house_id = t2.house_id
+        house_house t1 LEFT JOIN house_population t2 ON t1.house_id = t2.house_id
         WHERE
-            t1.is_delete = 0
+        t1.is_delete = 0
         <if test="buildingId != null and buildingId != ''">
             AND building_id = #{buildingId}
         </if>
@@ -1081,9 +1075,7 @@
         t1.creator,
         t1.gmt_create
         ORDER BY
-        t1.affiliation_unit,
-        t1.affiliation_floors,
-        t1.house_num ASC
+        (t1.affiliation_unit + 0), (t1.affiliation_floors + 0), (t1.house_num + 0) ASC
     </select>
 
 </mapper>
\ No newline at end of file