Merge remote-tracking branch 'origin/v3.5.1' into v3.5.1

src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java

@@ -58,8 +58,11 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
             QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("citycode",citycode);
             queryWrapper.eq("leveltype",2);
-            TdCity tdCity = tdCityMapper.selectOne(queryWrapper);
-            return tdCity;
+            List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
+            if (tdCities.size() > 0){
+                return tdCities.get(0);
+            }
+            return null;
         }
         return null;
     }

src/main/resources/mapper/Activity.xml

@@ -23,7 +23,7 @@
         <if test="cityId != null and cityId != ''">
             and city_id = #{cityId}
         </if>
-        ORDER BY weight desc,heavy desc,activity_status,start_date
+        ORDER BY heavy desc,activity_status,start_date
     </select>
     <select id="getCustomerActivityList" resultType="java.util.Map">
         SELECT