Commit 02f0cd5f694e705dc05abbf1cad8b5dd7e634fba

Authored by 周伟鹏
1 parent f222891a

主账号权限修改

src/main/java/com/cnlive/shenhe/controller/CommentsController.java
@@ -52,7 +52,7 @@ public class CommentsController { @@ -52,7 +52,7 @@ public class CommentsController {
52 Integer page, Integer pageSize, String orderByClause, HttpSession session) { 52 Integer page, Integer pageSize, String orderByClause, HttpSession session) {
53 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 53 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
54 Integer spid = sessionUser.getSpid(); 54 Integer spid = sessionUser.getSpid();
55 - if (spid == 0) spid = 82; 55 + if (spid == 0) spid = null;
56 if (CommonUtils.isNull(page)) page = 1; 56 if (CommonUtils.isNull(page)) page = 1;
57 if (CommonUtils.isNull(pageSize)) pageSize = 10; 57 if (CommonUtils.isNull(pageSize)) pageSize = 10;
58 Date sDate = null; 58 Date sDate = null;
src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -93,9 +93,7 @@ public class VideosController { @@ -93,9 +93,7 @@ public class VideosController {
93 Integer spid = sessionUser.getSpid(); 93 Integer spid = sessionUser.getSpid();
94 if (CommonUtils.isNull(page)) page = 1; 94 if (CommonUtils.isNull(page)) page = 1;
95 if (CommonUtils.isNull(pageSize)) pageSize = 10; 95 if (CommonUtils.isNull(pageSize)) pageSize = 10;
96 - if (CommonUtils.isNotNull(spid) && spid == 0) {  
97 - spid = 82;  
98 - } 96 + if (spid == 0) spid = null;
99 PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, page, pageSize, video_priority, orderByClause, spid); 97 PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, page, pageSize, video_priority, orderByClause, spid);
100 List<ShyVideos> list = videoPage.getList(); 98 List<ShyVideos> list = videoPage.getList();
101 if (!list.isEmpty()) { 99 if (!list.isEmpty()) {
@@ -108,8 +106,8 @@ public class VideosController { @@ -108,8 +106,8 @@ public class VideosController {
108 user.setUser_id(auditor_id); 106 user.setUser_id(auditor_id);
109 user = usersService.select(user); 107 user = usersService.select(user);
110 if (CommonUtils.isNotNull(user)) { 108 if (CommonUtils.isNotNull(user)) {
111 - String userName = CommonUtils.isEmpty(user.getUsername())?"":user.getUsername();  
112 - String email = CommonUtils.isEmpty(user.getEmail())?"":user.getEmail(); 109 + String userName = CommonUtils.isEmpty(user.getUsername()) ? "" : user.getUsername();
  110 + String email = CommonUtils.isEmpty(user.getEmail()) ? "" : user.getEmail();
113 auditor = userName + email; 111 auditor = userName + email;
114 } 112 }
115 } 113 }