|
@@ -236,8 +236,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
236
|
QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
|
236
|
QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
|
|
237
|
if(StringUtils.isNotBlank(object.optString("userId"))){
|
237
|
if(StringUtils.isNotBlank(object.optString("userId"))){
|
|
238
|
ew.eq("to_people", object.getInt("userId"));
|
238
|
ew.eq("to_people", object.getInt("userId"));
|
|
239
|
- //ew.eq("audit_state", 0);//已提交
|
|
|
|
240
|
- ew.and(x->x.eq("audit_state", 0).or().isNull("audit_state"));
|
|
|
|
|
|
239
|
+ ew.eq("audit_state", 0);//已提交
|
|
|
|
240
|
+ //ew.and(x->x.eq("audit_state", 0).or().isNull("audit_state"));
|
|
241
|
}
|
241
|
}
|
|
242
|
ew.orderByDesc("id");
|
242
|
ew.orderByDesc("id");
|
|
243
|
|
243
|
|
|
@@ -325,6 +325,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
325
|
processAudit1.setFromPeople(processAudit.getToPeople());//当前审批人是下一个审批的提交人
|
325
|
processAudit1.setFromPeople(processAudit.getToPeople());//当前审批人是下一个审批的提交人
|
|
326
|
processAudit1.setToPeople(toPeople);
|
326
|
processAudit1.setToPeople(toPeople);
|
|
327
|
processAudit1.setResult(0);
|
327
|
processAudit1.setResult(0);
|
|
|
|
328
|
+ processAudit1.setAuditState(0);//已提交待审批
|
|
328
|
processAudit1.setApplyPeople(processAudit.getApplyPeople());
|
329
|
processAudit1.setApplyPeople(processAudit.getApplyPeople());
|
|
329
|
processAudit1.setProcessId(processAudit.getProcessId());
|
330
|
processAudit1.setProcessId(processAudit.getProcessId());
|
|
330
|
processAuditMapper.insert(processAudit1);
|
331
|
processAuditMapper.insert(processAudit1);
|