|
|
@@ -3,7 +3,6 @@ package com.goafanti.common.controller;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.model.Admin;
|
|
|
-import com.goafanti.common.model.User;
|
|
|
import com.goafanti.common.utils.ParamUtils;
|
|
|
import com.goafanti.common.utils.RedisUtil;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
@@ -27,6 +26,7 @@ import java.text.DateFormat;
|
|
|
import java.text.MessageFormat;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
@Controller
|
|
|
public class BaseController {
|
|
|
@@ -126,13 +126,9 @@ public class BaseController {
|
|
|
model.addAttribute("csrf", TokenManager.getCSRF());
|
|
|
model.addAttribute("shiro", SecurityUtils.getSubject());
|
|
|
model.addAttribute("isAdmin", false);
|
|
|
- if (TokenManager.isLogin() && TokenManager.getToken() instanceof User) {
|
|
|
- model.addAttribute("userData", TokenManager.getUserToken());
|
|
|
- model.addAttribute("userName", TokenManager.getUserToken().getNickname());
|
|
|
- }
|
|
|
if (TokenManager.isLogin() && TokenManager.getToken() instanceof Admin) {
|
|
|
model.addAttribute("adminData", TokenManager.getAdminToken());
|
|
|
- model.addAttribute("userName", TokenManager.getAdminToken().getName());
|
|
|
+ model.addAttribute("userName", Objects.requireNonNull(TokenManager.getAdminToken()).getName());
|
|
|
model.addAttribute("departmentId", TokenManager.getAdminToken().getDepartmentId());
|
|
|
model.addAttribute("isAdmin", true);
|
|
|
model.addAttribute("shiroList", getshiroList());
|
|
|
@@ -155,23 +151,24 @@ public class BaseController {
|
|
|
*/
|
|
|
public String shiroAddRedis() {
|
|
|
redisUtil.deleteString(TokenManager.getAdminId());
|
|
|
- StringBuffer str=new StringBuffer();
|
|
|
- if (TokenManager.hasRole(AFTConstants.SALESMAN))str=str.append(1).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))str=str.append(2).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN))str=str.append(3).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR))str=str.append(4).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.FINANCE))str=str.append(5).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER))str=str.append(6).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN))str=str.append(7).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.TECH))str=str.append(8).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.TECH_MANAGER))str=str.append(9).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))str=str.append(10).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.OPERATION_MANAGER))str=str.append(11).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.CED_ASSISTANT))str=str.append(12).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.CED))str=str.append(13).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT))str=str.append(14).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))str=str.append(15).append(",");
|
|
|
- if (TokenManager.hasRole(AFTConstants.SUPERADMIN))str=str.append(99).append(",");
|
|
|
+ StringBuffer str= new StringBuffer();
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SALESMAN))str.append(1).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))str.append(2).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN))str.append(3).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR))str.append(4).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE))str.append(5).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER))str.append(6).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN))str.append(7).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.TECH))str.append(8).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.TECH_MANAGER))str.append(9).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))str.append(10).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.OPERATION_MANAGER))str.append(11).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.CED_ASSISTANT))str.append(12).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.CED))str.append(13).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT))str.append(14).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))str.append(15).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.TECH_TRANSFER)) str.append(16).append(",");
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN))str.append(99).append(",");
|
|
|
|
|
|
if (str.length()<1)return "0";
|
|
|
String shiroList=str.substring(0,str.length()-1);
|