anderx %!s(int64=4) %!d(string=hai) anos
pai
achega
cebb759cc8

+ 14 - 1
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -132,7 +132,20 @@ public class BaseController {
 			model.addAttribute("userName", TokenManager.getAdminToken().getName());
 			model.addAttribute("departmentId", TokenManager.getAdminToken().getDepartmentId());
 			model.addAttribute("isAdmin", true);
-			model.addAttribute("isSalesman", TokenManager.hasRole(AFTConstants.SALESMAN));
+			//0其他 1营销 2营销管理 3财务专员 4总裁 5超级管理员
+			Integer role=0;
+			if (TokenManager.hasRole(AFTConstants.SALESMAN)){
+				role=1;
+			}else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
+				role=2;
+			}else if (TokenManager.hasRole(AFTConstants.FINANCE)){
+				role=3;
+			}else if (TokenManager.hasRole(AFTConstants.CED)){
+				role=4;
+			}else if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+				role=5;
+			}
+			model.addAttribute("role", role);
 
 		}
 	}

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -3,6 +3,7 @@ package com.goafanti.order.service.impl;
 
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,7 +18,7 @@ public class PushOrderService {
     private AdminMapper adminMapper;
 
     public  String  ShiroConstant(String url,String aid,Integer approval,String orderDep){
-        if (!url.isEmpty()){
+        if (StringUtils.isNotNull(url)){
             if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
                     TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)||TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
                 return url;

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -367,7 +367,7 @@
 				departmentId : /*[[${adminData.departmentId}]]*/'',
 				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
 				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false,
-				isSalesman :/*[[${isSalesman}]]*/''
+				shiro :/*[[${shiro}]]*/''
 			}
 			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;
 			window.showServices = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/services')}]]*/false;