Browse Source

修改订单详情及权限

anderx 4 years ago
parent
commit
32b8aea0a2

+ 4 - 2
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -136,14 +136,16 @@ public class BaseController {
 			Integer role=0;
 			if (TokenManager.hasRole(AFTConstants.SALESMAN)){
 				role=1;
-			}else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
+			}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.SUPERADMIN)){
+			}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;
 	}

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

@@ -19,8 +19,10 @@ public class PushOrderService {
 
     public  String  ShiroConstant(String url,String aid,Integer approval,String orderDep){
         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.CUSTOMER_SERVICE) || TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)
+            || TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
                 return url;
             } else if (TokenManager.hasRole(AFTConstants.CED)) {
                 if (approval == 1) {

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