Merge remote-tracking branch 'origin/dev_renhu'

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -182,6 +182,7 @@
     </sql>
 
     <!--   查询列表用  -->
+    <!-- 2022.11.18 小寨子写死排序   -->
     <select id="selectListResiMap" parameterType="map" resultType="map">
         select
         ic_resi_user.id as icResiUserId,
@@ -212,13 +213,26 @@
                 ${groupTableName}.ID
             </foreach>
         </if>
-        ORDER BY
+        <choose>
-        IC_RESI_USER.GRID_ID desc,
+            <when test="customerId == '1536638904600752130'  ">
-        IC_RESI_USER.VILLAGE_ID ASC,
+                ORDER BY
-        IC_RESI_USER.BUILD_ID ASC,
+                field( i.GRID_ID, '1537272060187049986', '1537272342477508609', '1537275342477501111', '1593432493598076929' ),
-        IC_RESI_USER.UNIT_ID ASC,
+                i.VILLAGE_ID ASC,
-        IC_RESI_USER.HOME_ID ASC,
+                i.BUILD_ID ASC,
-        IC_RESI_USER.ID ASC
+                i.UNIT_ID ASC,
+                i.HOME_ID ASC,
+                i.ID ASC
+            </when>
+            <otherwise>
+                ORDER BY
+                IC_RESI_USER.GRID_ID desc,
+                IC_RESI_USER.VILLAGE_ID ASC,
+                IC_RESI_USER.BUILD_ID ASC,
+                IC_RESI_USER.UNIT_ID ASC,
+                IC_RESI_USER.HOME_ID ASC,
+                IC_RESI_USER.ID ASC
+            </otherwise>
+        </choose>
     </select>
 
     <update id="updateToDel" parameterType="map">