|
|
@@ -150,7 +150,12 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
//状态 1待审核、2审核通过、3审核拒绝、4审核中、5部分拒绝
|
|
|
String status = data.getString("status");
|
|
|
if ("4".equals(status)) {
|
|
|
- if (loginId.equals(leader)) {
|
|
|
+ ReimburseApply entity = this.getById(apply.getId());
|
|
|
+ if ("1".equals(entity.getFinalStatus())) {
|
|
|
+ //发送 财务审核
|
|
|
+ isFinancialReview = true;
|
|
|
+ apply.setLeaderId("");
|
|
|
+ } else if (loginId.equals(leader)) {
|
|
|
//登录人和待审核人一样,则是部门最后审核人
|
|
|
apply.setFinalStatus("1");
|
|
|
//是否是福利费用,是则发送审核 到指定审核人;否则 发送到财务
|
|
|
@@ -172,7 +177,9 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
sender = apply.getUserId();
|
|
|
}
|
|
|
this.updateById(apply);
|
|
|
- baseMapper.insertRel(sender, apply.getId());
|
|
|
+ if (!Check.isNull(sender)) {
|
|
|
+ baseMapper.insertRel(sender, apply.getId());
|
|
|
+ }
|
|
|
}
|
|
|
//流程到财务审核
|
|
|
if (isFinancialReview) {
|
|
|
@@ -191,7 +198,7 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
public Result<Object> submitReview(String id) {
|
|
|
ReimburseApply apply = this.getById(id);
|
|
|
sendMsg(apply.getLeaderId(), "1", id, null);
|
|
|
- return null;
|
|
|
+ return Result.ok();
|
|
|
}
|
|
|
|
|
|
// 获取审核人ID
|