张延森 hace 4 años
padre
commit
dc9a20d139

+ 1
- 1
pom.xml Ver fichero

@@ -10,7 +10,7 @@
10 10
 	</parent>
11 11
 	<groupId>com.huiju</groupId>
12 12
 	<artifactId>xiangsong</artifactId>
13
-	<version>1.1.7</version>
13
+	<version>1.1.8</version>
14 14
 	<name>xiangsong</name>
15 15
 	<description>香颂</description>
16 16
 

+ 3
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Ver fichero

@@ -109,7 +109,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
109 109
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
110 110
         buildingDynamicQueryWrapper.eq("org_id",orgId);
111 111
         buildingDynamicQueryWrapper.eq(home,"home",home);
112
-        buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
112
+        buildingDynamicQueryWrapper.orderByDesc("heavy");
113
+        buildingDynamicQueryWrapper.orderByAsc("activity_status");
114
+        buildingDynamicQueryWrapper.orderByDesc("create_date");
113 115
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
114 116
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
115 117
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间),2:未开始(展示活动报名时间),3:结束(不展示)