权限控制

周伟鹏
1 parent 7f2a643c
Showing 4 changed files with 32 additions and 21 deletions
src/main/java/com/cnlive/shenhe/bean/SessionUser.java
src/main/java/com/cnlive/shenhe/controller/SitesController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/resources/templates/common/frame.html
@@ -15,6 +15,7 @@ public class SessionUser {
     private String company;
     private String email;
     private String logo;
+    private boolean master;
     public String getUserId() {
         return userId;
@@ -67,4 +68,12 @@ public class SessionUser {
     public void setLogo(String logo) {
         this.logo = logo;
     }
+
+    public boolean isMaster() {
+        return master;
+    }
+
+    public void setMaster(boolean master) {
+        this.master = master;
+    }
 }
 package com.cnlive.shenhe.controller;
 import com.alibaba.fastjson.JSONObject;
-import com.cnlive.shenhe.bean.ErrorEnum;
-import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
@@ -14,7 +12,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpSession;
 import java.util.List;
@@ -46,22 +46,23 @@ public class SitesController {
     public String page(Model model, Integer page, Integer pageSize, String orderByClause, String keyword, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
-        if (spid != 0){
+        if (!sessionUser.isMaster() && spid != 0) {
             return "page/error.html";
         }
+        if (spid == 0) spid = null;
         if (CommonUtils.isNull(page)) page = 1;
         if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        PageInfo<ShySites> sitePage = sitesService.getPage(page, pageSize, orderByClause, keyword, null);
+        PageInfo<ShySites> sitePage = sitesService.getPage(page, pageSize, orderByClause, keyword, spid);
         List<ShySites> list = sitePage.getList();
         JSONObject business = CommonConst.BUSINESS;
-        if(!list.isEmpty()){
-            for (ShySites site:list) {
+        if (!list.isEmpty()) {
+            for (ShySites site : list) {
                 String write_business_name = site.getWrite_business();
-                if(CommonUtils.isNotEmpty(write_business_name)){
-                    for (String bkey:business.keySet()) {
+                if (CommonUtils.isNotEmpty(write_business_name)) {
+                    for (String bkey : business.keySet()) {
                         write_business_name = write_business_name.replace(bkey, business.getString(bkey));
                     }
-                }else{
+                } else {
                     write_business_name = "无";
                 }
                 site.setWrite_business_name(write_business_name);
@@ -74,25 +75,25 @@ public class SitesController {
     @PostMapping(value = "/write")
-    public String write(Integer siteId, String[] write_business, HttpSession session,String redirect_url) {
+    public String write(Integer siteId, String[] write_business, HttpSession session, String redirect_url) {
+        ShySites site = sitesService.get(siteId);
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
-        if (spid != 0){
+        if ((!sessionUser.isMaster() && spid != 0) || (sessionUser.isMaster() && site.getSpid() != spid)) {
             return "page/error.html";
         }
-        ShySites site = sitesService.get(siteId);
         String write = "";
-        if(CommonUtils.isNotNull(write_business)&&write_business.length>0){
-            for (String w:write_business) {
-                write = write+","+w;
+        if (CommonUtils.isNotNull(write_business) && write_business.length > 0) {
+            for (String w : write_business) {
+                write = write + "," + w;
             }
             write = write.substring(1);
         }
         site.setWrite_business(write);
         boolean success = sitesService.update(site);
-        if(success){
-            return "redirect:"+redirect_url;
-        }else{
+        if (success) {
+            return "redirect:" + redirect_url;
+        } else {
             return "error.html";
         }
     }
@@ -51,6 +51,7 @@ public class UsersController {
                 sessionUser.setCompany(user.getCompany_brief());
                 sessionUser.setEmail(user.getEmail());
                 sessionUser.setLogo(user.getUser_logo());
+                sessionUser.setMaster(user.getMaster());
                 request.getSession().setAttribute(SessionUser.SESSION_KEY,sessionUser);
                 return "redirect:/videos/page";
             }
@@ -67,10 +67,10 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; th:text=&quot;${session.sessionUser.
                 </a>
                 <ul class="treeview-menu">
                     <li class="active"><a href="/videos/page"></i> 点播审核</a></li>
-                    <li><a href="/comments/page/list"> 评论审核</a></li>
+                    <li><a href="/comments/page"> 评论审核</a></li>
                 </ul>
             </li>
-            <li class="treeview" th:if="${session.sessionUser.spid==0}">
+            <li class="treeview" th:if="${session.sessionUser.spid==0 or session.sessionUser.master}">
                 <a href="http://shenhe.cnlive.com/videos#">
                     <span class="menu-item-top">系统管理</span>
                 </a>