bug fix

src/main/resources/mapper/HelpActivityMapper.xml

@@ -72,7 +72,8 @@
                 a.end_date as endDate,
                 a.`status` as status,
                 a.activity_status as activityStatus,
-				"help" AS type
+				"help" AS type,
+                a.heavy
 			FROM
 				ta_help_activity a
 				WHERE
@@ -86,7 +87,6 @@
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
                 </if>
-                 order  by a.heavy desc
 		)
 		UNION ALL
 			(
@@ -99,7 +99,8 @@
                     s.end_time as endDate,
                     s.status as status,
                     s.activity_status as activityStatus,
-					"group" AS type
+					"group" AS type,
+                    s.heavy
 				FROM
 					ta_share_activity s
 					WHERE
@@ -113,7 +114,6 @@
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}
                 </if>
-                order  by s.heavy desc
 			)
 		UNION ALL
 		    (
@@ -126,7 +126,8 @@
                 t.end_date as endDate,
                 t.status as status,
                 t.activity_status as activityStatus,
-                "activity" AS type
+                "activity" AS type,
+                t.heavy
                 FROM
                 ta_building_dynamic t
                 WHERE
@@ -140,8 +141,8 @@
                 <if test="buildingId != null and buildingId != ''">
                     and t.building_id = #{buildingId}
                 </if>
-                order  by t.heavy desc
             )
+            order by heavy
     </select>
 
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">