周伟鹏 / cnlive_shenhe · Commits

Commit 57d74a2393ce7a995ad54a420266429f079138c6

Authored by 王言钊
1 parent 5fd5a101

修复直播申请、网++禁言管理模块

Inline Side-by-side
Showing 5 changed files with 26 additions and 20 deletions
src/main/java/com/cnlive/shenhe/dto/LiveApplyDTO.java
  View file @57d74a2
... ... @@ -67,7 +67,7 @@ public class LiveApplyDTO extends ShyLiveapply implements Serializable {
67 67 }
68 68  
69 69 public Integer getPage() {
70   - return page == null ? 1 : page;
  70 + return page;
71 71 }
72 72  
73 73 public void setPage(Integer page) {
... ... @@ -75,7 +75,7 @@ public class LiveApplyDTO extends ShyLiveapply implements Serializable {
75 75 }
76 76  
77 77 public Integer getPageSize() {
78   - return pageSize == null ? 10 : pageSize;
  78 + return pageSize;
79 79 }
80 80  
81 81 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/NotSpeakDTO.java
  View file @57d74a2
... ... @@ -35,7 +35,7 @@ public class NotSpeakDTO extends ShyNotspeak implements Serializable {
35 35 }
36 36  
37 37 public Integer getPage() {
38   - return page == null ? 1 : page;
  38 + return page;
39 39 }
40 40  
41 41 public void setPage(Integer page) {
... ... @@ -43,7 +43,7 @@ public class NotSpeakDTO extends ShyNotspeak implements Serializable {
43 43 }
44 44  
45 45 public Integer getPageSize() {
46   - return pageSize == null ? 10 : pageSize;
  46 + return pageSize;
47 47 }
48 48  
49 49 public void setPageSize(Integer pageSize) {
... ...
src/main/resources/templates/common/frame.html
  View file @57d74a2
... ... @@ -85,7 +85,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
85 85 <li><a href="/content/page?receive_status=0" 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   - <li><a href="/liveApply/page?shenhe_state=0&receive=0" id="/liveApply/page">直播申请审核</a></li>
  88 + <li><a href="/liveApply/page?shenhe_state=0&receive=0&page=1&pageSize=10" id="/liveApply/page">直播申请审核</a></li>
89 89 </ul>
90 90 </li>
91 91 <li class="treeview" th:if="${session.sessionUser.spid==0 || session.sessionUser.spid==60}">
... ... @@ -97,7 +97,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
97 97 <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
98 98 <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
99 99 <li><a href="/usersFree/page?page=1&pageSize=10" id="/usersFree/page"> 网++白名单管理</a></li>
100   - <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
  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>
102 102 <li><a href="/log/page?pageNum=1&pageSize=10" id="/log/page"> 日志管理</a></li>
103 103 </ul>
... ...
src/main/resources/templates/page/liveApply.html
  View file @57d74a2
... ... @@ -80,7 +80,8 @@
80 80 <div class="col-md-6" style="padding: 0;width: 100%;">
81 81 <label for="liveApply_theme" class="control-label cb-toolbar">直播主题:</label>
82 82 <div class="col-sm-7" style="padding: 0;">
83   - <input class="form-control" type="text" th:value="${Theme}" value="" id="liveApply_theme">
  83 + <input class="form-control" type="text" th:value="${Theme}" value=""
  84 + id="liveApply_theme">
84 85 </div>
85 86 </div>
86 87 </div>
... ... @@ -116,7 +117,8 @@
116 117 <div class="col-md-5" style="padding: 0;width: 100%;">
117 118 <label for="organization" class="control-label cb-toolbar">发起单位:</label>
118 119 <div class="col-sm-7" style="padding: 0;">
119   - <input class="form-control" type="text" th:value="${Organization}" value="" id="organization"
  120 + <input class="form-control" type="text" th:value="${Organization}" value=""
  121 + id="organization"
120 122 name="organization">
121 123 </div>
122 124 </div>
... ... @@ -127,7 +129,8 @@
127 129 th:if="${session.sessionUser.spid==0}">
128 130 <label for="sp_desc" class="control-label cb-toolbar">sp简称:</label>
129 131 <div class="col-sm-7" style="padding: 0;">
130   - <input class="form-control" type="text" th:value="${Sp_desc}" value="" id="sp_desc">
  132 + <input class="form-control" type="text" th:value="${Sp_desc}" value=""
  133 + id="sp_desc">
131 134 </div>
132 135 </div>
133 136 </div>
... ... @@ -407,6 +410,7 @@
407 410 if (r != null) return unescape(r[2]);
408 411 return null;
409 412 }
  413 +
410 414 // 状态==2是展开状态 触发展开
411 415 $(function () {
412 416 if (GetQueryString("expand_list_state") == "2") {
... ... @@ -461,7 +465,7 @@
461 465 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
462 466 }
463 467 h = h.substring(1, h.length);
464   - window.location.href = "/liveApply/page?" + h + "&pageSize=" + pageSize;
  468 + window.location.href = "/liveApply/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
465 469 } else {
466 470 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
467 471 var split = se.split("&");
... ... @@ -471,7 +475,7 @@
471 475 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
472 476 }
473 477 h = h.substring(1, h.length);
474   - window.location.href = "/liveApply/page?" + h + "&pageSize=" + pageSize;
  478 + window.location.href = "/liveApply/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
475 479 }
476 480 }
477 481  
... ... @@ -508,7 +512,7 @@
508 512 updateValue();
509 513 var receive = "";
510 514 var expand_list_state = $("#forms").attr("expand_list_state");
511   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
  515 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
512 516 }
513 517  
514 518 //全部待领
... ... @@ -516,27 +520,27 @@
516 520 updateValue();
517 521 if ($.trim(shenhe_state) == '') shenhe_state = 0;
518 522 var receive = 0;
519   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
  523 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count;
520 524 });
521 525 //我的待审核
522 526 $('#Mydaishen').click(function () {
523 527 updateValue();
524 528 var receive = 1;
525 529 if ($.trim(shenhe_state) == '') shenhe_state = 0;
526   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
  530 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count;
527 531 });
528 532 //我的已审核
529 533 $('#yishen').click(function () {
530 534 updateValue();
531 535 var receive = 1;
532 536 if ($.trim(shenhe_state) == '') shenhe_state = 3;//审核状态，3代表通过和拒绝都查询
533   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
  537 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&receive=" + receive + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count;
534 538 });
535 539  
536 540  
537 541 //查询
538 542 $('#videos_query').click(function () {
539   - window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&organization=" + organization + "&sp_desc=" + sp_desc + "&pageSize=" + count;
  543 + window.location.href = "/liveApply/page?theme=" + liveApply_theme + "&start_date=" + start_date + "&end_date=" + end_date + "&shenhe_state=" + shenhe_state + "&organization=" + organization + "&sp_desc=" + sp_desc + "&page=" + 1 + "&pageSize=" + count;
540 544 });
541 545 /*全选的操作*/
542 546 $('#select_all').click(function () {
... ...
src/main/resources/templates/page/notspeak.html
  View file @57d74a2
... ... @@ -134,7 +134,8 @@
134 134 <div class="col-md-5" style="padding: 0">
135 135 <label for="user_name" class="control-label cb-toolbar">用户昵称:</label>
136 136 <div class="col-sm-8" style="padding: 0;">
137   - <input class="form-control" name="user_name" th:value="${User_name}" type="text" id="user_name">
  137 + <input class="form-control" name="user_name" th:value="${User_name}"
  138 + type="text" id="user_name">
138 139 </div>
139 140 </div>
140 141 <!-- <div class="col-md-3" style="padding: 0"> -->
... ... @@ -451,6 +452,7 @@
451 452 if (r != null) return unescape(r[2]);
452 453 return null;
453 454 }
  455 +
454 456 // 状态==2是展开状态 触发展开
455 457 $(function () {
456 458 if (GetQueryString("expand_list_state") == "2") {
... ... @@ -483,7 +485,7 @@
483 485 user_name = $("#user_name").val();
484 486 count = $("#pageSize").val();
485 487 var expand_list_state = $("#forms").attr("expand_list_state");
486   - window.location.href = "/notSpeak/page?user_id=" + user_id + "&user_name=" + user_name + "&state=" + state + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
  488 + window.location.href = "/notSpeak/page?user_id=" + user_id + "&user_name=" + user_name + "&state=" + state + "&page=" + 1 + "&pageSize=" + count + "&expand_list_state=" + expand_list_state;
487 489 }
488 490  
489 491 //全部
... ... @@ -584,7 +586,7 @@
584 586 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
585 587 }
586 588 h = h.substring(1, h.length);
587   - window.location.href = "/notSpeak/page?" + h + "&pageSize=" + pageSize;
  589 + window.location.href = "/notSpeak/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
588 590 } else {
589 591 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
590 592 var split = se.split("&");
... ... @@ -594,7 +596,7 @@
594 596 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
595 597 }
596 598 h = h.substring(1, h.length);
597   - window.location.href = "/notSpeak/page?" + h + "&pageSize=" + pageSize;
  599 + window.location.href = "/notSpeak/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
598 600 }
599 601 }
600 602  
... ...