|
@@ -352,14 +352,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
|
352
|
352
|
QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
|
353
|
353
|
taRaiseQueryWrapper.eq("org_id", orgId);
|
354
|
354
|
taRaiseQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
|
355
|
|
- taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
|
|
355
|
+ taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
|
356
|
356
|
TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
|
357
|
|
- if (taRaise != null && null != taRaise.getInvite() && taRaise.getInvite() != CommConstant.STATUS_NORMAL) {
|
|
357
|
+ if (taRaise == null) {
|
358
|
358
|
resultSalesBatchList.add(record);
|
359
|
359
|
return;
|
360
|
360
|
}
|
361
|
361
|
|
362
|
|
- if(taRaise != null && null != taRaise.getInvite() && taRaise.getInvite() == CommConstant.STATUS_NORMAL){
|
|
362
|
+ // 未开启邀请制
|
|
363
|
+ if (CommConstant.STATUS_NORMAL != taRaise.getInvite()) {
|
|
364
|
+ resultSalesBatchList.add(record);
|
|
365
|
+ return;
|
|
366
|
+ }
|
|
367
|
+
|
|
368
|
+ if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
|
363
|
369
|
// 若开启邀请制,校验该用户是否在邀请列表中
|
364
|
370
|
QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
|
365
|
371
|
taRaiseInviteQueryWrapper.eq("org_id", orgId);
|