|
|
@@ -326,7 +326,9 @@ public class BizArchiveInputController extends BaseController {
|
|
|
delProcess.addAll(l.getProcesses());
|
|
|
} else {
|
|
|
BizArchiveInputDetail newItem = newBizArchiveInput.getDetails().stream().filter(v -> l.getId().equals(v.getId())).findFirst().orElse(new BizArchiveInputDetail());
|
|
|
- delProcess.addAll(l.getProcesses().stream().filter(v -> newItem.getProcesses().stream().noneMatch(e -> e.getId().equals(v.getId()))).collect(Collectors.toList()));
|
|
|
+ delProcess.addAll(l.getProcesses().stream()
|
|
|
+ .filter(v -> newItem.getProcesses().stream()
|
|
|
+ .noneMatch(e -> e.getId()!= null && e.getId().equals(v.getId()))).collect(Collectors.toList()));
|
|
|
if (newBizArchiveInput.getServiceType().equals(1)) {
|
|
|
boolean a = (newItem.getFreeNum() + newItem.getServiceNum()) != (l.getServiceNum() + l.getFreeNum());
|
|
|
boolean b = (newItem.getPrice().subtract(newItem.getDiscountAmount())).compareTo(l.getPrice().subtract(l.getDiscountAmount())) != 0;
|
ly