|
|
@@ -1588,18 +1588,19 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
|
|
1588
|
1588
|
if(j-1<=list.size()-1){
|
|
1589
|
1589
|
// 业务
|
|
1590
|
1590
|
ProcessAudit audit = list.get(j-1);
|
|
1591
|
|
- item.setAuditTime(audit.getAuditTime());
|
|
1592
|
|
- item.setContent(audit.getToPeople());
|
|
1593
|
|
- if(flag){//不通过
|
|
1594
|
|
- if(j-1==list.size()-1){
|
|
1595
|
|
- item.setAuditState(2);
|
|
1596
|
|
- }else{
|
|
1597
|
|
- item.setAuditState(1);
|
|
1598
|
|
- }
|
|
1599
|
|
- }else{
|
|
1600
|
|
- item.setAuditState(audit.getAuditState());
|
|
1601
|
|
- }
|
|
1602
|
|
-
|
|
|
1591
|
+ if(null != audit.getToPeople()){
|
|
|
1592
|
+ item.setAuditTime(audit.getAuditTime());
|
|
|
1593
|
+ item.setContent(audit.getToPeople());
|
|
|
1594
|
+ if(flag){//不通过
|
|
|
1595
|
+ if(j-1==list.size()-1){
|
|
|
1596
|
+ item.setAuditState(2);
|
|
|
1597
|
+ }else{
|
|
|
1598
|
+ item.setAuditState(1);
|
|
|
1599
|
+ }
|
|
|
1600
|
+ }else{
|
|
|
1601
|
+ item.setAuditState(audit.getAuditState());
|
|
|
1602
|
+ }
|
|
|
1603
|
+ }
|
|
1603
|
1604
|
}
|
|
1604
|
1605
|
}
|
|
1605
|
1606
|
if(pbList.get(1).getAuditState().equals(4) || pbList.get(1).getAuditState().equals(3)){
|