Merge remote-tracking branch 'origin/dev' into dev

pom.xml

 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.8</version>
+	<version>v3.5.10</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPosterMapper;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.ITaBuildingRoomService;
+import com.huiju.estateagents.service.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.apache.commons.collections.CollectionUtils;
 import org.checkerframework.checker.units.qual.A;
     @Autowired
     private TaHousingResourcesMapper taHousingResourcesMapper;
 
+    @Autowired
+    private ITaHousingResourcesService taHousingResourcesService;
+
     @Autowired
     private ITaBuildingRoomService taBuildingRoomService;
 
         List<TaHousingResources> housingList =taHousingResourcesMapper.selectHousingList(orgId,taSalesBatchList);
         List<TaBuildingRoom> taBuildingRoomList = new ArrayList<>();
         housingList.forEach(e -> {
+            e.setStatus(CommConstant.STATUS_DELETE);
             TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
             taBuildingRoom.setRoomId(e.getRoomId());
             taBuildingRoom.setStatus(CommConstant.STATUS_DELETE);
             taBuildingRoomList.add(taBuildingRoom);
         });
-        taBuildingRoomService.updateBatchById(taBuildingRoomList);
+
+        //房源改为无效
+        if (CollectionUtils.isNotEmpty(housingList)){
+            taHousingResourcesService.updateBatchById(housingList);
+        }
+
+        if (CollectionUtils.isNotEmpty(taBuildingRoomList)){
+            taBuildingRoomService.updateBatchById(taBuildingRoomList);
+        }
 
         //删除销售批次
         taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);

src/main/resources/mapper/TaShareCountMapper.xml

                 when e.building_name != null || e.building_name != '' then e.building_name
                 when f.news_name != null || f.news_name != '' then f.news_name
                 when h.sales_batch_name != null || h.sales_batch_name !='' then h.sales_batch_name
-                when a.`name` != null || a.`name` != '' then a.`name`
+                WHEN y.`name` != NULL || y.`name` != '' THEN y.`name`
                 else '空'
                 end as shareTitle,
                         z.phone as personPhone,