Commit b1e91ae96da9d628ea8e6c0abe8bf4936c07f9ef
Merge branch 'dev'
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/java/com/cnlive/shenhe/controller/LiveController.java
| @@ -152,9 +152,9 @@ public class LiveController extends BaseController { | @@ -152,9 +152,9 @@ public class LiveController extends BaseController { | ||
| 152 | } | 152 | } |
| 153 | String orderByClause = ""; | 153 | String orderByClause = ""; |
| 154 | if (shenhe_state != null && shenhe_state == 0) {//审核状态：全部待领 | 154 | if (shenhe_state != null && shenhe_state == 0) {//审核状态：全部待领 |
| 155 | - orderByClause = "pre_start_time "; | 155 | + orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time "; |
| 156 | } else if (shenhe_state != null && shenhe_state == 1) {//审核状态：待审核 | 156 | } else if (shenhe_state != null && shenhe_state == 1) {//审核状态：待审核 |
| 157 | - orderByClause = "pre_start_time "; | 157 | + orderByClause = "field(activity_status,1,3,2,0,4), pre_start_time "; |
| 158 | } else if (shenhe_state != null && shenhe_state == 2) {//审核状态：已审核 | 158 | } else if (shenhe_state != null && shenhe_state == 2) {//审核状态：已审核 |
| 159 | orderByClause = "pre_start_time desc"; | 159 | orderByClause = "pre_start_time desc"; |
| 160 | } else {//审核状态：全部 | 160 | } else {//审核状态：全部 |