|
|
@@ -262,9 +262,25 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date,2);
|
|
|
in.setProcessStatus(in.getProcessStatus()+1);
|
|
|
}else {
|
|
|
- if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(aid);
|
|
|
+ //获取上级
|
|
|
+ List<AdminPublicReviewerBo> superList=adminPublicReviewerBos.stream().filter(e -> e.getType() == 2).collect(Collectors.toList());
|
|
|
+ //无上级
|
|
|
+ boolean success = false;
|
|
|
+ if (superList.isEmpty())success=true;
|
|
|
+ //我也是我的上级
|
|
|
+ boolean success2 = false;
|
|
|
+ if (!superList.isEmpty()){
|
|
|
+ for (AdminPublicReviewerBo e : superList) {
|
|
|
+ if (e.getReviewerId().equals(admin.getId())){
|
|
|
+ success2=true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (success||success2){
|
|
|
|
|
|
- String str2=String.format("%s跳过[%s]。",admin.getSuperiorId()==null?"发起人无上级":"发起人与上级同人",EAProcessStatus.getDesc(in.getProcessStatus()));
|
|
|
+ String str2=String.format("%s跳过[%s]。",success?"发起人无上级":"发起人与上级同人",EAProcessStatus.getDesc(in.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000L);
|
|
|
addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date,2);
|