获取学校样式时，如果学校无则使用默认

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolStypeService.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -110,6 +111,23 @@ public class SchoolStypeService {
 
     //根据学校id获取列表
     public List <TSchoolStype> listAll2(TSchoolStype stype) {
-        return schoolStypeMapper.findAll2(stype);
+        List<TSchoolStype> lst = schoolStypeMapper.findAll2(stype);
+        List<TSchoolStype> rtnlst = new ArrayList<>();
+        //获取学校样式，如果学校未设置使用default设置的内容
+        Map<String,List<TSchoolStype>> map = lst.stream().collect(Collectors.groupingBy(TSchoolStype :: getSchooltype,Collectors.toList()));
+        for(Map.Entry<String, List<TSchoolStype>> entry : map.entrySet()){
+            List<TSchoolStype> maplist = entry.getValue();
+            if(maplist.size() == 1){
+                rtnlst.add(maplist.get(0));
+            }else if(maplist.size()>1){
+                for(TSchoolStype s : maplist){
+                    if(!s.getSchooldomain().equals("default")){
+                        rtnlst.add(s);
+                        break;
+                    }
+                }
+            }
+        }
+        return rtnlst;
     }
 }