|
@@ -83,6 +83,9 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
apply.setType(projects.get(0).getType());
|
|
|
}
|
|
|
String leader = getLeader(data.getString("userId"));
|
|
|
+ if (Check.isNull(leader)) {
|
|
|
+ return Result.error("创建失败,userId:" + data.getString("userId") + ",未查询到下一级的审核人员,请联系管理员");
|
|
|
+ }
|
|
|
apply.setLeaderId(leader);
|
|
|
SysUser user = sysUserService.getById(apply.getUserId());
|
|
|
if (!Check.isNull(user)) {
|
|
@@ -143,6 +146,9 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
if (loginId.equals(apply.getUserId())) {
|
|
|
//获取下次审核人信息
|
|
|
sender = getLeader(loginId);
|
|
|
+ if (Check.isNull(sender)) {
|
|
|
+ return Result.error("编辑失败,userId:" + loginId + ",未查询到下一级的审核人员,请联系管理员");
|
|
|
+ }
|
|
|
apply.setLeaderId(sender);
|
|
|
apply.setStatus("1");
|
|
|
this.updateById(apply);
|
|
@@ -155,6 +161,9 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
ReimburseApply entity = this.getById(apply.getId());
|
|
|
//获取下次审核人信息
|
|
|
String leader = getLeader(entity.getLeaderId());
|
|
|
+ if (Check.isNull(sender)) {
|
|
|
+ return Result.error("编辑失败,userId:" + entity.getLeaderId() + ",未查询到下一级的审核人员,请联系管理员");
|
|
|
+ }
|
|
|
//审核人 操作流程:↓↓↓
|
|
|
//状态 1待审核、2审核通过、3审核拒绝、4审核中、5部分拒绝
|
|
|
String status = data.getString("status");
|
|
@@ -263,7 +272,9 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ if (leader.isEmpty()) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
//第一审核人
|
|
|
String firstId = leader.getString("first_id");
|
|
|
//第二审核人
|