周伟鹏 / cnlive_shenhe · Commits

Commit 404500b66c23bebe8744427f649587812b72f563

Authored by 王言钊
1 parent 81160148

修复图文、邮件消息管理模块并测试

Inline Side-by-side
Showing 5 changed files with 16 additions and 16 deletions
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java
  View file @404500b
... ... @@ -33,7 +33,7 @@ public class ContentDTO extends ShyContent implements Serializable {
33 33 }
34 34  
35 35 public Integer getPage() {
36   - return page == null ? 1 : page;
  36 + return page;
37 37 }
38 38  
39 39 public void setPage(Integer page) {
... ... @@ -41,7 +41,7 @@ public class ContentDTO extends ShyContent implements Serializable {
41 41 }
42 42  
43 43 public Integer getPageSize() {
44   - return pageSize == null ? 10 : pageSize;
  44 + return pageSize;
45 45 }
46 46  
47 47 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/EmailDTO.java
  View file @404500b
... ... @@ -25,7 +25,7 @@ public class EmailDTO extends ShyEmail 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 EmailDTO extends ShyEmail 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 @404500b
... ... @@ -82,7 +82,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
82 82 <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
83 83 <li><a href="/live/page?shenhe_state=0" 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   - <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
  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>
87 87 <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
88 88 <li><a href="/liveApply/page?shenhe_state=0&receive=0&page=1&pageSize=10" id="/liveApply/page">直播申请审核</a></li>
... ... @@ -95,7 +95,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
95 95 <ul class="treeview-menu">
96 96 <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
97 97 <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
98   - <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
  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>
100 100 <li><a href="/notSpeak/page?page=1&pageSize=10" id="/notSpeak/page"> 网++禁言管理</a></li>
101 101 <li><a href="/activity/page?pageNum=1&pageSize=10" id="/activity/page"> 活动管理</a></li>
... ...
src/main/resources/templates/page/content.html
  View file @404500b
... ... @@ -451,7 +451,7 @@
451 451 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
452 452 }
453 453 h = h.substring(1, h.length);
454   - window.location.href = "/content/page?" + h + "&pageSize=" + pageSize;
  454 + window.location.href = "/content/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
455 455 } else {
456 456 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
457 457 var split = se.split("&");
... ... @@ -461,7 +461,7 @@
461 461 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
462 462 }
463 463 h = h.substring(1, h.length);
464   - window.location.href = "/content/page?" + h + "&pageSize=" + pageSize;
  464 + window.location.href = "/content/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
465 465 }
466 466 }
467 467  
... ... @@ -501,32 +501,32 @@
501 501 function quanbu() {
502 502 updateValue();
503 503 var expand_list_state = $("#forms").attr("expand_list_state");
504   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
  504 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag + "&expand_list_state=" + expand_list_state;
505 505 }
506 506  
507 507 //全部待领
508 508 $('#daishen').click(function () {
509 509 updateValue();
510 510 var receive_status = 0;
511   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
  511 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
512 512 });
513 513 //我的待审核
514 514 $('#Mydaishen').click(function () {
515 515 updateValue();
516 516 var receive_status = 1;
517   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
  517 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
518 518 });
519 519 //我的已审核
520 520 $('#yishen').click(function () {
521 521 updateValue();
522 522 var receive_status = 2;
523   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
  523 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
524 524 });
525 525  
526 526  
527 527 //查询
528 528 $('#videos_query').click(function () {
529   - window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
  529 + window.location.href = "/content/page?title=" + title + "&source=" + source + "&author=" + author + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&contentId=" + contentId + "&content_tag=" + content_tag;
530 530 });
531 531 /*全选的操作*/
532 532 $('#select_all').click(function () {
... ...
src/main/resources/templates/page/email.html
  View file @404500b
... ... @@ -396,7 +396,7 @@ input:checked + .slider:before {
396 396 if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
397 397 }
398 398 h = h.substring(1, h.length);
399   - window.location.href = "/email/page?" + h + "&pageSize=" + pageSize;
  399 + window.location.href = "/email/page?" + h + "&page="+ 1 + "&pageSize=" + pageSize;
400 400 } else {
401 401 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
402 402 var split = se.split("&");
... ... @@ -406,7 +406,7 @@ input:checked + .slider:before {
406 406 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
407 407 }
408 408 h = h.substring(1, h.length);
409   - window.location.href = "/email/page?" + h + "&pageSize=" + pageSize;
  409 + window.location.href = "/email/page?" + h + "&page="+ 1 + "&pageSize=" + pageSize;
410 410 }
411 411 }
412 412  
... ... @@ -415,7 +415,7 @@ input:checked + .slider:before {
415 415 var email = $("#email_query").val();
416 416 var remark = $("#remark_query").val();
417 417 var pageSize = $("#pageSize").val();
418   - window.location.href = "/email/page?email=" + email + "&remark=" + remark+ "&pageSize=" + pageSize;
  418 + window.location.href = "/email/page?email=" + email + "&remark=" + remark + "&page="+ 1 + "&pageSize=" + pageSize;
419 419 });
420 420  
421 421 //鼠标回车事件
... ...