获取学校样式过滤

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

@@ -113,17 +113,26 @@ public class SchoolStypeService {
     public List <TSchoolStype> listAll2(TSchoolStype 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;
+        if(N_Utils.isListNotEmpty(lst)){
+            List<TSchoolStype> filterlst = new ArrayList<>();
+            for(TSchoolStype s : lst){
+                if(s.getStid()!=null && s.getStid()>0){
+                    filterlst.add(s);
+                }
+            }
+
+            //获取学校样式，如果学校未设置使用default设置的内容
+            Map<String,List<TSchoolStype>> map = filterlst.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;
+                        }
                     }
                 }
             }