Browse Source

版本切换

anderx 4 years ago
parent
commit
dd7bb49785

+ 7 - 3
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -14,11 +14,15 @@ public class AFTConstants {
 	public static final String	INITIALPASSWORD						= "123456";				
 
 	/**	超级管理员 */
-	public static final String	SUPERADMIN							= "999999";				
+	public static final String	SUPERADMIN							= "999999";
 	/**	特批决策者 */
-	public static final String	APPROVAL_DECISION					= "99999";				
+	public static final String	APPROVAL_DECISION					= "99999";
+	/**	特批决策者 */
+	public static final String	APPROVAL_DECISION_AUDITOR			= "99989";
 	/**	总裁 */
-	public static final String	CED									= "99998";				
+	public static final String	CED									= "99998";
+	/**	总裁审核 */
+	public static final String	CED_AUDITOR							= "99988";
 	/**	集团副总 */
 	public static final String	VICE_CEO							= "99997";				
 	/** 技术管理员 */

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

@@ -29,7 +29,7 @@ public class PushOrderService {
     public String processStatusConstant(String url,String aid,Integer processStatus){
         //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
-                TokenManager.hasRole(AFTConstants.CED) ){
+                TokenManager.hasRole(AFTConstants.CED) ||TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
             return url;
         }else if (((TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)))&&
                 TokenManager.getAdminId().equals(aid)){
@@ -58,7 +58,7 @@ public class PushOrderService {
         boolean flag=false;
         //流程状态 0营销员 1营销管理员 2技术员 3技术经理 4技术总监 5财务专员(退单) 6财务总监 7总裁 8董事长 9 财务专员(非退单)
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
-                TokenManager.hasRole(AFTConstants.CED) ){
+                TokenManager.hasRole(AFTConstants.CED) ||TokenManager.hasRole(AFTConstants.CED_AUDITOR)){
             flag=true;
         } else  if(TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
             flag=true;
@@ -102,7 +102,8 @@ public class PushOrderService {
                     }
                     break;
                 case 8:
-                    if((TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)&&status!=2)||
+
+                    if((TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||(TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_AUDITOR))&&status!=2)||
                             (TokenManager.hasRole(AFTConstants.FINANCE)&&status==2)){
                         flag=true;
                     }