周伟鹏 / cnlive_shenhe · Commits

Commit ae830b7332cf0760a4b21c52e7af1cf6659cd491

Authored by 王言钊
1 parent 404500b6

修复用户管理、直播审核模块

Inline Side-by-side
Showing 5 changed files with 12 additions and 12 deletions
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java
  View file @ae830b7
... ... @@ -37,7 +37,7 @@ public class LiveDTO extends ShyLive implements Serializable {
37 37 }
38 38  
39 39 public Integer getPage() {
40   - return page == null ? 1 : page;
  40 + return page;
41 41 }
42 42  
43 43 public void setPage(Integer page) {
... ... @@ -45,7 +45,7 @@ public class LiveDTO extends ShyLive implements Serializable {
45 45 }
46 46  
47 47 public Integer getPageSize() {
48   - return pageSize == null ? 20 : pageSize;
  48 + return pageSize;
49 49 }
50 50  
51 51 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/UsersDTO.java
  View file @ae830b7
... ... @@ -25,7 +25,7 @@ public class UsersDTO extends ShyUsers implements Serializable {
25 25 }
26 26  
27 27 public Integer getPage() {
28   - return page == null ? 1 : page;
  28 + return page;
29 29 }
30 30  
31 31 public void setPage(Integer page) {
... ... @@ -33,7 +33,7 @@ public class UsersDTO extends ShyUsers implements Serializable {
33 33 }
34 34  
35 35 public Integer getPageSize() {
36   - return pageSize == null ? 10 : pageSize;
  36 + return pageSize;
37 37 }
38 38  
39 39 public void setPageSize(Integer pageSize) {
... ...
src/main/resources/templates/common/frame.html
  View file @ae830b7
... ... @@ -80,7 +80,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
80 80 <ul class="treeview-menu">
81 81 <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li>
82 82 <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
83   - <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li>
  83 + <li><a href="/live/page?shenhe_state=0&page=1&pageSize=20" id="/live/page"> 直播审核</a></li>
84 84 <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
85 85 <li><a href="/content/page?receive_status=0&page=1&pageSize=10" id="/content/page"> 图文审核</a></li>
86 86 <li><a href="/topic/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/topic/page"> 话题审核</a></li>
... ... @@ -93,7 +93,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
93 93 <span class="menu-item-top">系统管理</span>
94 94 </a>
95 95 <ul class="treeview-menu">
96   - <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
  96 + <li><a href="/users/page?page=1&pageSize=10" id="/users/page"> 审核云用户管理</a></li>
97 97 <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
98 98 <li><a href="/email/page?page=1&pageSize=10" id="/email/page"> 邮件消息管理</a></li>
99 99 <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li>
... ...
src/main/resources/templates/page/live.html
  View file @ae830b7
... ... @@ -490,7 +490,7 @@
490 490 contentId = $("#contentId").val();
491 491 }
492 492 var expand_list_state = $("#forms").attr("expand_list_state");
493   - window.location.href = "/live/page?activity_status=" + activity_status + "&activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&activity_name=" + activity_name + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&shenhe_state=" + shenhe_state + "&contentId=" + contentId + "&expand_list_state=" + expand_list_state;
  493 + window.location.href = "/live/page?activity_status=" + activity_status + "&activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&activity_name=" + activity_name + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&shenhe_state=" + shenhe_state + "&contentId=" + contentId + "&expand_list_state=" + expand_list_state;
494 494 }
495 495  
496 496 //全部
... ... @@ -770,7 +770,7 @@
770 770 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
771 771 }
772 772 h = h.substring(1, h.length);
773   - window.location.href = "/live/page?" + h + "&pageSize=" + pageSize;
  773 + window.location.href = "/live/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
774 774 } else {
775 775 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
776 776 var split = se.split("&");
... ... @@ -780,7 +780,7 @@
780 780 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
781 781 }
782 782 h = h.substring(1, h.length);
783   - window.location.href = "/live/page?" + h + "&pageSize=" + pageSize;
  783 + window.location.href = "/live/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
784 784 }
785 785 }
786 786  
... ...
src/main/resources/templates/page/users.html
  View file @ae830b7
... ... @@ -297,7 +297,7 @@
297 297 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
298 298 }
299 299 h = h.substring(1, h.length);
300   - window.location.href = "/users/page?" + h + "&pageSize=" + pageSize;
  300 + window.location.href = "/users/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
301 301 } else {
302 302 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
303 303 var split = se.split("&");
... ... @@ -307,7 +307,7 @@
307 307 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
308 308 }
309 309 h = h.substring(1, h.length);
310   - window.location.href = "/users/page?" + h + "&pageSize=" + pageSize;
  310 + window.location.href = "/users/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
311 311 }
312 312 }
313 313  
... ... @@ -318,7 +318,7 @@
318 318 var sp_id = $("#sp_id").val();
319 319 var mobile = $("#mobile").val();
320 320 var pageSize = $("#pageSize").val();
321   - window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile+ "&pageSize=" + pageSize;
  321 + window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile + "&page=" + 1 + "&pageSize=" + pageSize;
322 322 });
323 323 //鼠标回车事件
324 324 $(document).keyup(function(event){
... ...