Bladeren bron

Merge branch 'test' of jishutao/kede-server into prod

anderx 4 jaren geleden
bovenliggende
commit
9ee616dd18

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

@@ -132,7 +132,22 @@ 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_ADMIN)){
+				role=2;
+			}else if (TokenManager.hasRole(AFTConstants.FINANCE)){
+				role=3;
+			}else if (TokenManager.hasRole(AFTConstants.CED)){
+				role=4;
+			}else if (TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
+				role=5;
+			}else if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+				role=6;
+			}
+			model.addAttribute("role", role);
 
 		}
 	}

+ 0 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -563,7 +563,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
 		String url=pushOrderService.ShiroConstant(tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getApproval(),tOrder.getOrderDep());
-		logger.debug(url);
 		tOrder.setContractPictureUrl(url);
 		return tOrder;
 	}

+ 26 - 22
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,48 +18,51 @@ public class PushOrderService {
     private AdminMapper adminMapper;
 
     public  String  ShiroConstant(String url,String aid,Integer approval,String orderDep){
-        if (!url.isEmpty()){
-            if(TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
-                    TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)||TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
+        if (StringUtils.isNotNull(url)) {
+            //暂时开放营销管理员可以查看
+            if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
+                    TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE) || TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)
+            || TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
                 return url;
-            }else if (TokenManager.hasRole(AFTConstants.CED)){
-                if (approval==1){
+            } else if (TokenManager.hasRole(AFTConstants.CED)) {
+                if (approval == 1) {
                     return url;
-                }else{
+                } else {
                     return url;
                 }
-            }else if(TokenManager.hasRole(AFTConstants.FINANCE)){
-                String depId=adminMapper.getFinanceDep(TokenManager.getAdminId());
-                if (orderDep.equals(depId)){
+            } else if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+                String depId = adminMapper.getFinanceDep(TokenManager.getAdminId());
+                if (orderDep.equals(depId)) {
                     return url;
-                }else{
+                } else {
                     return DEFAULTS_URL;
                 }
-            }else if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
-                List<String> deps=adminMapper.getLowerFinanceDep(TokenManager.getAdminId());
-                boolean flag=false;
+            } else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
+                List<String> deps = adminMapper.getLowerFinanceDep(TokenManager.getAdminId());
+                boolean flag = false;
                 for (String dep : deps) {
-                    if (orderDep.equals(deps)){
-                        flag=true;
+                    if (orderDep.equals(deps)) {
+                        flag = true;
                         break;
                     }
-                    if (flag){
+                    if (flag) {
                         return url;
-                    }else{
+                    } else {
                         return DEFAULTS_URL;
                     }
 
                 }
 
-            } else if (TokenManager.hasRole(AFTConstants.SALESMAN)){
-                if (TokenManager.getAdminId().equals(aid)){
+            } else if (TokenManager.hasRole(AFTConstants.SALESMAN)) {
+                if (TokenManager.getAdminId().equals(aid)) {
                     return url;
-                }else{
+                } else {
                     return DEFAULTS_URL;
                 }
+            } else {
+                return DEFAULTS_URL;
             }
         }
-
-        return DEFAULTS_URL;
+        return null;
     }
 }

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -48,7 +48,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//172.16.0.253
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.92
+static.host=//static.jishutao.com/1.1.93
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -41,7 +41,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.92
+static.host=//static.jishutao.com/1.1.93
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload

+ 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}]]*/''
+				role :/*[[${role}]]*/''
 			}
 			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;
 			window.showServices = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/services')}]]*/false;