Browse Source

skip shelf in relatedSupport

xuchaolang 6 years ago
parent
commit
e554490545

+ 13 - 3
rankin-product-service/src/main/java/cn/rankin/productservice/service/SupportReferenceService.java

@@ -27,14 +27,24 @@ public class SupportReferenceService {
     }
 
     @Transactional
-    public void update(String supportId, List<String> supportIdList) {
-        if (supportIdList == null) {
+    public void update(String supportId, List<String> tidList) {
+        if (tidList == null) {
             return;
-        }else if (supportIdList.size() == 0) {
+        }else if (tidList.size() == 0) {
             deleteBySupportId(supportId);
             return;
         }
 
+        //去除自身
+        List<String> supportIdList = new ArrayList<>();
+        tidList.forEach( id -> {
+            if (supportId.equals(id)){
+               return;
+            }
+            supportIdList.add(id);
+        });
+
+
         List<SupportReference> relationList = relationRepository.findAllByFid(supportId);
         List<String> existSupportIdList = new ArrayList<>();
 

+ 10 - 6
rankin-product-service/src/main/java/cn/rankin/productservice/service/SupportService.java

@@ -2,12 +2,9 @@ package cn.rankin.productservice.service;
 
 import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.product.dto.SupportDTO;
-import cn.rankin.common.utils.enums.BaseOrderEnum;
 import cn.rankin.common.utils.enums.BaseStatusEnum;
-import cn.rankin.common.utils.util.JpaSortUtil;
 import cn.rankin.common.utils.util.ListUtil;
+import cn.rankin.data.api.product.dto.SupportDTO;
 import cn.rankin.data.api.product.entity.Support;
 import cn.rankin.data.api.product.entity.SupportReference;
 import cn.rankin.productservice.code.ProductServiceAPICode;
@@ -17,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import static cn.rankin.productservice.utils.DTOConverter.convert;
 
@@ -120,7 +119,12 @@ public class SupportService {
         }
 
         List<String> supportIdList = new ArrayList<>();
-        relationList.forEach( relation -> supportIdList.add(relation.getTid()));
+        relationList.forEach( (relation) -> {
+            if (fid.equals(relation.getTid())){
+                return;
+            }
+            supportIdList.add(relation.getTid());
+        });
 
         List<Support> supportList = supportRepository.findByIds(supportIdList, BaseStatusEnum.NORMAL);