|
|
@@ -1196,19 +1196,19 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//1-3s是不同人的审核
|
|
|
if (in.getProcessStatus()!=null&&in.getProcessStatus()==1){
|
|
|
// 财务审核,复审,出纳都是财务与经理
|
|
|
- if (TokenManager.hasRole(AFTConstants.FINANCE)||TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
- in.setProcessStatus(3);
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
|
|
|
- in.setProcessStatus(1);
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
- in.setProcessStatus(2);
|
|
|
+ if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
|
|
|
+ in.setProcessStatus(6);
|
|
|
}else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)){
|
|
|
in.setProcessStatus(5);
|
|
|
}else if(TokenManager.hasRole(AFTConstants.VICE_CEO)){
|
|
|
//先不做财务查看权限
|
|
|
in.setProcessStatus(7);
|
|
|
- }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
|
|
|
- in.setProcessStatus(6);
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
|
|
|
+ in.setProcessStatus(1);
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
+ in.setProcessStatus(2);
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.FINANCE)||TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
+ in.setProcessStatus(3);
|
|
|
}
|
|
|
}else {
|
|
|
in.setProcessStatus(0);
|
|
|
@@ -1253,7 +1253,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (in.getEndTime()!=null)params.put("endTime",in.getEndTime());
|
|
|
if (in.getCheckNo()!=null)params.put("checkNo",in.getCheckNo());
|
|
|
//0=自己 1=财务 2=财务经理 3=超管
|
|
|
- if (TokenManager.hasRole(AFTConstants.SUPERADMIN)){
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
|
|
|
params.put("roleType",3);
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
params.put("roleType",2);
|