|
@@ -77,11 +77,13 @@ public class PaperDetailServiceImpl extends ServiceImpl<PaperDetailDao, PaperDet
|
|
|
unitSet.add(u.getDetailNumber() + "-" + u.getDetailUnitNumber());
|
|
|
}
|
|
|
for (PaperDetail pd : ret) {
|
|
|
- for (PaperDetailUnit u : pd.getUnits()) {
|
|
|
- if (unitSet.contains(pd.getNumber() + "-" + u.getNumber())) {
|
|
|
- u.setInGroup(true);
|
|
|
- } else {
|
|
|
- u.setInGroup(false);
|
|
|
+ if (CollectionUtils.isNotEmpty(pd.getUnits())) {
|
|
|
+ for (PaperDetailUnit u : pd.getUnits()) {
|
|
|
+ if (unitSet.contains(pd.getNumber() + "-" + u.getNumber())) {
|
|
|
+ u.setInGroup(true);
|
|
|
+ } else {
|
|
|
+ u.setInGroup(false);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|