diff --git a/src/main/java/io/v/nutz/activity/controller/site/SiteManageController.java b/src/main/java/io/v/nutz/activity/controller/site/SiteManageController.java
index 17f4043..97500ba 100644
--- a/src/main/java/io/v/nutz/activity/controller/site/SiteManageController.java
+++ b/src/main/java/io/v/nutz/activity/controller/site/SiteManageController.java
@@ -56,7 +56,7 @@ public class SiteManageController {
if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderName)) {
cnd.orderBy(pageOrderName, PageUtil.getOrder(pageOrderBy));
} else {
- cnd.desc("create_time");
+ cnd.asc("sortNum");
}
return siteInfoService.listPage(pageNumber, pageSize, cnd);
diff --git a/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java b/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java
index f97ce01..8d3c5b9 100644
--- a/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java
+++ b/src/main/java/io/v/nutz/activity/controller/site/SiteReserveController.java
@@ -245,7 +245,7 @@ public class SiteReserveController {
if (StrUtil.isNotBlank(siteType)) {
cnd.and("typeId", "=", siteType);
}
- cnd.and(new Static(" 1=1 order by left(address, 5) desc, field(asi.reserveTarget, 2, 1, 3)"));
+ cnd.asc("asi.sortNum");
sql.setCondition(cnd);
return siteInfoService.list(sql);
}
diff --git a/src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java b/src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java
index 15be75f..fc51126 100644
--- a/src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java
+++ b/src/main/java/io/v/nutz/activity/models/ActivitySiteInfo.java
@@ -92,4 +92,9 @@ public class ActivitySiteInfo {
@Comment("面向预约对象(1.面向分工会，2.面向个人，3.面向集体)")
@ColDefine(type = ColType.INT)
private Integer reserveTarget;
+
+ @Column
+ @Comment("排序编号")
+ @ColDefine(type = ColType.INT)
+ private Integer sortNum;
}
diff --git a/src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java b/src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java
index d28100c..450de62 100644
--- a/src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java
+++ b/src/main/java/io/v/nutz/mobile/activity/site/SiteInfoMobileController.java
@@ -110,8 +110,8 @@ public class SiteInfoMobileController {
if (StrUtil.isNotBlank(typeId)) {
cnd.andEX("info.typeId", "=", typeId);
}
- cnd.and(new Static(" 1=1 group by info.id order by left(address, 5) desc, field(info.reserveTarget, 2, 1, 3)"));
-
+ cnd.asc("info.sortNum");
+ cnd.groupBy("info.id");
sql.setCondition(cnd);
Pagination pagination = siteInfoService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
diff --git a/src/main/resources/views/platform/activity/site/SiteManage.html b/src/main/resources/views/platform/activity/site/SiteManage.html
index 9d75fc4..42d54a6 100644
--- a/src/main/resources/views/platform/activity/site/SiteManage.html
+++ b/src/main/resources/views/platform/activity/site/SiteManage.html
@@ -48,6 +48,8 @@ layout("/layouts/platform.html"){
+
-
-
- 不限制
- 男
- 女
-
-
+
+
+
+
+ 不限制
+ 男
+ 女
+
+
+
+
+
+
+ 开启
+ 禁用
+
+
+
+
+
-
-
- 开启
- 禁用
-
+
+
-
-
-
-