Browse Source

查看权限新增营销经理

anderx 4 years ago
parent
commit
d6f8e8b82e

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

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

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

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