bug

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

@@ -753,8 +753,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         taRaiseQueryWrapper.eq("org_id",orgId);
         taRaiseQueryWrapper.eq("sales_batch_id",taHousingResources.getSalesBatchId());
         taRaiseQueryWrapper.eq("building_id",taHousingResources.getBuildingId());
+        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
-        if (taRaise.getStatus() != CommConstant.STATUS_NORMAL) {
+        if (null == taRaise) {
             throw new Exception("认筹单已经作废");
         }
         //校验房源是否同一批次
@@ -771,20 +772,21 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 preselectionRecordQueryWrapper.eq("org_id", orgId);
                 preselectionRecordQueryWrapper.eq("house_id", houseId);
                 preselectionRecordQueryWrapper.eq("person_id", personId);
+                preselectionRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
                 TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.selectOne(preselectionRecordQueryWrapper);
                 if (null == taPreselectionRecord) {
                     throw new Exception("需要先预选才能认筹");
                 }
             }
             //查询我的认筹记录表
-            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-            taRaiseHouseQueryWrapper.eq("org_id", orgId);
-            taRaiseHouseQueryWrapper.eq("house_id", houseId);
-            taRaiseHouseQueryWrapper.eq("person_id", personId);
-            List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
-            if (list.size() > 0) {
-                throw new Exception("您已有认筹单包含当前房源");
-            }
+//            QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
+//            taRaiseHouseQueryWrapper.eq("org_id", orgId);
+//            taRaiseHouseQueryWrapper.eq("house_id", houseId);
+//            taRaiseHouseQueryWrapper.eq("person_id", personId);
+//            List<TaRaiseHouse> list = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
+//            if (list.size() > 0) {
+//                throw new Exception("您已有认筹单包含当前房源");
+//            }
 
         }
         if (taHousingResources.getStatus() != CommConstant.STATUS_NORMAL) {