|
|
@@ -1593,7 +1593,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//如果是营销员,强制只能看自己的
|
|
|
if(in.getProcessStatus()==0){
|
|
|
in.setProcessStatus(0);
|
|
|
- param.put("aid",TokenManager.getAdminId());
|
|
|
}
|
|
|
if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
//财务经理查看权限
|
|
|
@@ -1606,22 +1605,15 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//0 设置为财务查看
|
|
|
param.put("roleType",0);
|
|
|
}
|
|
|
- if(in.getProcessStatus()==2){
|
|
|
+ if(in.getProcessStatus()==2||in.getProcessStatus()==1){
|
|
|
if (in.getAid()!=null){
|
|
|
param.put("aid",in.getAid());
|
|
|
}
|
|
|
param.put("auditor",TokenManager.getAdminId());
|
|
|
- }
|
|
|
- if(in.getProcessStatus()==1) {
|
|
|
- param.put("auditor",TokenManager.getAdminId());
|
|
|
- if (in.getAid()!=null){
|
|
|
- param.put("aid",in.getAid());
|
|
|
- }
|
|
|
- }else {
|
|
|
+ }else {
|
|
|
param.put("aid",TokenManager.getAdminId());
|
|
|
}
|
|
|
param.put("processStatus",in.getProcessStatus());
|
|
|
-
|
|
|
if (in.getExamineStatus()!=null){
|
|
|
param.put("examineStatus",in.getExamineStatus());
|
|
|
}else {
|