|
@@ -265,9 +265,14 @@ public class TaHousingResourcesController extends BaseController {
|
265
|
265
|
List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
|
266
|
266
|
|
267
|
267
|
//认筹记录对应的有效房源,我的锁定的房源也在里面
|
268
|
|
- QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
|
269
|
|
- taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0, "raise_record_id", taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
|
270
|
|
- List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
|
|
268
|
+ List<TaRaiseHouse> taRaiseHouseList = new ArrayList<>();
|
|
269
|
+ if (taRaiseRecordList.size() > 0){
|
|
270
|
+ QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
|
|
271
|
+ taRaiseHouseQueryWrapper.in("raise_record_id", taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
|
|
272
|
+ taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
|
|
273
|
+ }
|
|
274
|
+ List<TaRaiseHouse> finalTaRaiseHouseList = taRaiseHouseList;
|
|
275
|
+
|
271
|
276
|
TaSalesBatch taSalesBatch = taSalesBatchService.getById(salesBatchId);
|
272
|
277
|
taHousingResourcesPOList.forEach(e -> {
|
273
|
278
|
taPreselectionRecordList.forEach(p -> {
|
|
@@ -278,7 +283,7 @@ public class TaHousingResourcesController extends BaseController {
|
278
|
283
|
});
|
279
|
284
|
//我的认筹和锁定
|
280
|
285
|
if (CollectionUtils.isNotEmpty(taRaiseRecordList)) {
|
281
|
|
- taRaiseHouseList.forEach(r -> {
|
|
286
|
+ finalTaRaiseHouseList.forEach(r -> {
|
282
|
287
|
//我的认筹
|
283
|
288
|
if (e.getHouseId().equals(r.getHouseId())) {
|
284
|
289
|
e.setMineRaise("mine");
|