合并并解决冲突

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -1,17 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -620,21 +608,21 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("notTagType", questionIndexVO.getNotTagType());
         paramMap.put("notControlType", questionIndexVO.getNotControlType());
         List<QuestionInfo> list = this.index(paramMap);
-        if(ListUtil.isNotEmpty(list)){
-        	Map<Long,Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i->i.getId()).collect(Collectors.toList()));
-        	list = list.stream().filter(i->{
-            	if(couMap.get(i.getId())!=null){
-            		return false;
-            	}
-            	return true;
+        if (ListUtil.isNotEmpty(list)) {
+            Map<Long, Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i -> i.getId()).collect(Collectors.toList()));
+            list = list.stream().filter(i -> {
+                if (couMap.get(i.getId()) != null) {
+                    return false;
+                }
+                return true;
             }).collect(Collectors.toList());
-        	if(ListUtil.isNotEmpty(list)){
-        		List<IndexRevDTO> indexRevDTOList = BeanUtil.listCopyTo(list, IndexRevDTO.class);
-        		indexRevDTOList.forEach(i->{
-        			i.setTypeName(QuestionTypeEnum.getName(i.getType()));
-        		});
-        		return indexRevDTOList;
-        	}
+            if (ListUtil.isNotEmpty(list)) {
+                List<IndexRevDTO> indexRevDTOList = BeanUtil.listCopyTo(list, IndexRevDTO.class);
+                indexRevDTOList.forEach(i -> {
+                    i.setTypeName(QuestionTypeEnum.getName(i.getType()));
+                });
+                return indexRevDTOList;
+            }
         }
         return null;
     }