|
|
@@ -116,20 +116,22 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
for (int i=1;i<4;i++){
|
|
|
ExpenseAccountExamine eae=new ExpenseAccountExamine(id,i);
|
|
|
if (i==1){
|
|
|
- //新增一级
|
|
|
- String examineId=null;
|
|
|
- String examineName=null;
|
|
|
- //正常用上级,没有的情况下就是自己
|
|
|
- if (a.getSuperId()!=null){
|
|
|
- examineId=a.getSuperId();
|
|
|
- examineName=a.getSuperName();
|
|
|
- }else {
|
|
|
- examineId=a.getId();
|
|
|
- examineName=a.getName();
|
|
|
+ if (a.getExpenseSuperExamine()==1){
|
|
|
+ //新增一级
|
|
|
+ String examineId=null;
|
|
|
+ String examineName=null;
|
|
|
+ //正常用上级,没有的情况下就是自己
|
|
|
+ if (a.getSuperId()!=null){
|
|
|
+ examineId=a.getSuperId();
|
|
|
+ examineName=a.getSuperName();
|
|
|
+ }else {
|
|
|
+ examineId=a.getId();
|
|
|
+ examineName=a.getName();
|
|
|
+ }
|
|
|
+ eae.setAuditor(examineId);
|
|
|
+ eae.setAuditorname(examineName);
|
|
|
+ ea.setExamineName(examineName);
|
|
|
}
|
|
|
- eae.setAuditor(examineId);
|
|
|
- eae.setAuditorname(examineName);
|
|
|
- ea.setExamineName(examineName);
|
|
|
}else if (i==2){
|
|
|
if (StringUtils.isBlank(dep.getManagerName())){
|
|
|
throw new BusinessException("报销申请部门[管理员]不存在。");
|