yonge преди 2 години
родител
ревизия
490e1d8b5f
променени са 1 файла, в които са добавени 8 реда и са изтрити 1 реда
  1. 8 1
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

+ 8 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -119,7 +119,14 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
             	subjects = new ArrayList<Subject>();
             }
             if(StringUtils.isNotBlank(userExtSubjectIds)){
-            	subjects.addAll(findBySubjectByIdList(userExtSubjectIds));
+            	List<Long> idList = subjects.stream().map(t -> t.getId()).collect(Collectors.toList());
+            	
+            	List<Subject> extSubjectList = findBySubjectByIdList(userExtSubjectIds);
+            	for(Subject ext : extSubjectList){
+            		if(!idList.contains(ext.getId())){
+            			subjects.add(ext);
+            		}
+            	}
             }
 
             List<Long> parentIds = subjects.stream().map(Subject::getParentSubjectId).collect(Collectors.toList());