Merge branch 'fixbug/feat1003438' into 'master'

bug: [none] 解决地理位置咨询匹配出现重复的bug

See merge request rays/pcloud-book!917

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletNewsBizImpl.java

@@ -211,10 +211,10 @@ public class AppletNewsBizImpl implements AppletNewsBiz {
     }
 
     private void saveAppletNewsCategory(List<AppletNewsCategory> categoryList, Long newsId) {
+        appletNewsCategoryDao.deletebyNewsId(newsId);
         if (ListUtils.isEmpty(categoryList)) {
             return;
         }
-        appletNewsCategoryDao.deletebyNewsId(newsId);
 
         List<AppletNewsCategory> list = new ArrayList<>();
         for (AppletNewsCategory category : categoryList) {

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -34,8 +34,6 @@ import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
 import com.pcloud.book.consumer.erp.ErpConsr;
 import com.pcloud.book.consumer.reader.ReaderConsr;
 import com.pcloud.book.consumer.resource.ProductConsr;
-import com.pcloud.book.consumer.user.AdviserConsr;
-import com.pcloud.book.consumer.user.MerchantConsr;
 import com.pcloud.book.cultivate.enums.ReadTypeEnum;
 import com.pcloud.book.custom.biz.CustomPlanBiz;
 import com.pcloud.book.custom.entity.CustomPlan;
@@ -1993,6 +1991,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             //数据库取
             if (ListUtils.isEmpty(newsDTOS) || newsDTOS.size() < top) {
                 if (item.getRightsClassifyId() == 13){
+                    if (CollUtil.isNotEmpty(appletNews4Area)&&CollUtil.isNotEmpty(item.getAppletNewsDTOS())){
+                        Map<Long, AppletNewsDTO> itemMap = item.getAppletNewsDTOS().stream().collect(Collectors.toMap(AppletNewsDTO::getId, AppletNewsDTO -> AppletNewsDTO));
+                        appletNews4Area.removeIf(appletNewsDTO -> itemMap.containsKey(appletNewsDTO.getId()));
+                    }
                     newsDTOS = appletNews4Area;
                 }else if(!MapUtils.isEmpty(map) && map.containsKey(item.getRightsClassifyId())) {
                     newsDTOS = map.get(item.getRightsClassifyId());