Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -352,21 +352,23 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
             taRaiseQueryWrapper.eq("org_id", orgId);
             taRaiseQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
+            taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
-            if (taRaise != null && taRaise.getInvite() != CommConstant.STATUS_NORMAL) {
+            if (taRaise != null && null != taRaise.getInvite() && taRaise.getInvite() != CommConstant.STATUS_NORMAL) {
                 resultSalesBatchList.add(record);
                 return;
             }
 
-            // 若开启邀请制，校验该用户是否在邀请列表中
-            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-            taRaiseInviteQueryWrapper.eq("org_id", orgId);
-            taRaiseInviteQueryWrapper.eq("invite_tel", person.getTel());
-            taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
-            TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
-            if (taRaiseInvite != null) {
-                resultSalesBatchList.add(record);
-                return;
+            if(taRaise != null && null != taRaise.getInvite() &&  taRaise.getInvite() == CommConstant.STATUS_NORMAL){
+                // 若开启邀请制，校验该用户是否在邀请列表中
+                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+                taRaiseInviteQueryWrapper.eq("org_id", orgId);
+                taRaiseInviteQueryWrapper.eq("invite_tel", person.getTel());
+                taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
+                TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+                if (taRaiseInvite != null) {
+                    resultSalesBatchList.add(record);
+                }
             }
         });