|
|
@@ -1656,14 +1656,18 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
param.put("auditor",TokenManager.getAdminId());
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
//0 设置为财务查看
|
|
|
- param.put("roleType",0);
|
|
|
+
|
|
|
param.put("auditor",TokenManager.getAdminId());
|
|
|
//如果是空设置为
|
|
|
if (in.getProcessStatus()==null)in.setProcessStatus(2);
|
|
|
}else {
|
|
|
- //如果不是特定角色就只看自己的
|
|
|
in.setProcessStatus(0);
|
|
|
}
|
|
|
+ if (in.getRoleType()==null){
|
|
|
+ param.put("roleType",0);
|
|
|
+ }else {
|
|
|
+ param.put("roleType",in.getRoleType());
|
|
|
+ }
|
|
|
if(in.getProcessStatus()==2||in.getProcessStatus()==1){
|
|
|
if (in.getAid()!=null){
|
|
|
param.put("aid",in.getAid());
|