完成率

src/main/java/com/lsw/controller/ReportController.java

@@ -1,6 +1,5 @@
 package com.lsw.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.JsonKit;
 import com.jfinal.kit.Kv;
@@ -9,7 +8,6 @@ import com.jfinal.plugin.activerecord.Record;
 import com.lsw.utils.StringUtil;
 import com.lsw.utils.TimeUtil;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -26,11 +24,11 @@ public class ReportController extends Controller {
         List<Record> list = department_list.stream().filter(r -> r.get("ID").equals(ID)).collect(Collectors.toList());
         for (Record record : list) {
             //二级
-            List<Record> list2 = department_list.stream().filter(r -> r.get("SUPERIOR").equals(record.get("ID"))).collect(Collectors.toList());
+            List<Record> list2 = department_list.stream().filter(r -> r.get("SUPERIOR")!=null&&r.get("SUPERIOR").equals(record.get("ID"))).collect(Collectors.toList());
             record.set("children", list2);
             for (Record record2 : list2) {
                 //三级
-                List<Record> list3 = department_list.stream().filter(r -> r.get("SUPERIOR").equals(record2.get("ID"))).collect(Collectors.toList());
+                List<Record> list3 = department_list.stream().filter(r ->r.get("SUPERIOR")!=null&&r.get("SUPERIOR").equals(record2.get("ID"))).collect(Collectors.toList());
                 record2.set("children", list3);
             }