'commit'

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -826,19 +826,19 @@ public class CollectModel {
                            int shiZhiJiaoFu, int quXiaoJiaoYuJu, String bureauIds, String groupIds, String memo, int fill_type_id) throws ParseException {
         Set<String> bureauSet = new HashSet<>();
         if (shiZhiSchool == 1) {
-            Page<Record> list = getBureauList(9, null,0,null, 1, 9999);
+            Page<Record> list = getBureauList(9, null, 0, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
         if (shiZhiJiaoFu == 1) {
-            Page<Record> list = getBureauList(5, null,0,null, 1, 9999);
+            Page<Record> list = getBureauList(5, null, 0, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
         if (quXiaoJiaoYuJu == 1) {
-            Page<Record> list = getBureauList(11, null, 0,null,1, 9999);
+            Page<Record> list = getBureauList(11, null, 0, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
@@ -859,8 +859,10 @@ public class CollectModel {
         // 有哪些县区教育局
         List<Record> xianQuJiaoYuJuList = getXianQuJiaoYuJu(bureauIds, groupIds);
         Set<String> xianQuJiaoYuJuSet = new HashSet<>();
-        for (Record record : xianQuJiaoYuJuList) {
-            xianQuJiaoYuJuSet.add(record.getStr("org_id"));
+        if (xianQuJiaoYuJuList != null) {
+            for (Record record : xianQuJiaoYuJuList) {
+                xianQuJiaoYuJuSet.add(record.getStr("org_id"));
+            }
         }
 
         //写主表
@@ -1435,14 +1437,14 @@ public class CollectModel {
         //获取此县区的所有学校
         Set<String> bureauSet = new HashSet<>();
         if (allSchool == 1) {
-            Page<Record> list = getBureauList(area_id, 16, null,0,null, 1, 9999);
+            Page<Record> list = getBureauList(area_id, 16, null, 0, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }
         }
         //获取此县区的所有教辅单位
         if (allJiaoFu == 1) {
-            Page<Record> list = getBureauList(area_id, 14, null,0,null, 1, 9999);
+            Page<Record> list = getBureauList(area_id, 14, null, 0, null, 1, 9999);
             for (Record record : list.getList()) {
                 bureauSet.add(record.getStr("org_id"));
             }