Browse Source

Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	src/main/java/com/goafanti/common/constant/AFTConstants.java


Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
6aeed486b3

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

@@ -18,7 +18,9 @@ public class AFTConstants {
 	public static final String	APPROVAL_DECISION					= "99999";				// 特批决策者
 	
 	public static final String	CED									= "999998";				// 总裁
-	
+
+	public static final String	VICE_CEO							= "999997";				// 集团副总
+
 		
 	public static final String  TECH_ADMIN                          = "99998";				// 技术管理员
 	

+ 1 - 1
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -91,7 +91,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		Result res = new Result();
 		//财务专员自己的id
 		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
-		&& !TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)) {
+				&& !TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)&& !TokenManager.hasRole(AFTConstants.VICE_CEO)) {
 			order.setFinanceId(TokenManager.getAdminId());
 		}
 		//order.setProcessStatus(3);//分配给自己 改为前端 传3未分配  4已分配