'commit'

src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java

@@ -1471,7 +1471,14 @@ public class ZbdcModel {
 
                 } else {
                     String school_type_name = getSchoolTypeName(school_type_id);
-                    p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' and area_id='" + area_id + "'and school_type_name='" + school_type_name + "' order by area_name");
+                    String select;
+                    if (StrKit.isBlank(area_id)) {
+                        select = "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' and school_type_name='" + school_type_name + "' order by area_name";
+                    } else {
+                        select = "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' and area_id='" + area_id + "'and school_type_name='" + school_type_name + "' order by area_name";
+                    }
+
+                    p = Db.paginate(page, limit, "select *", select);
                 }
             }
         } else {//指定具体单位ID