Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

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

@@ -924,7 +924,9 @@ public class ZbdcModel {
         } else {//县区
             sql += " and parent_id='" + area_id + "'";
             if (school_type_id > 0) {//某个学校类型
-                sql += " and school_type_id=" + school_type_id;
+                sql += " and org_type_id=16 and school_type_id=" + school_type_id;
+            }else{
+                sql += " and school_type_id in (211,311,218,312,341,342,345) and org_type_id=16";
             }
         }
         if (!StrKit.isBlank(keyword)) {
@@ -953,7 +955,7 @@ public class ZbdcModel {
      */
     public String getShiZhiBureauIds(int school_type_id, String keyword) {
         if (StrKit.isBlank(keyword)) keyword = "";
-        String sql = "select org_id from t_base_organization where school_type_id>0 and city_id='064BB3C9-E8DB-45ED-B0C1-6ABC5EA3B667' and org_id=bureau_id and org_type_id=9 and org_name like '%" + keyword + "%' ";
+        String sql = "select org_id from t_base_organization where city_id='064BB3C9-E8DB-45ED-B0C1-6ABC5EA3B667' and org_id=bureau_id and org_type_id=9 and org_name like '%" + keyword + "%' ";
         if (school_type_id > 0) {//某个学校类型
             sql += " and school_type_id=" + school_type_id;
         }
@@ -979,19 +981,24 @@ public class ZbdcModel {
          * -1：全部
          * 其它：学校类型
          */
-        if (StrKit.isBlank(area_id)) {
+        if (!StrKit.isBlank(area_id)) {//市直或指定区域
             //指定区域
             String bureauIds;
-            if (school_type_id <= 0) {//如果是市直属 或者 全部
+            if (area_id.equals("0")) {
                 bureauIds = getShiZhiBureauIds(school_type_id, keyword);
-            } else { //不是全部，也不是市直属，而是某个区县
+            } else { //不是市直属，而是某个区县
                 bureauIds = getBureauIds(area_id, school_type_id, keyword);
             }
             if (StrKit.isBlank(bureauIds)) bureauIds = "'-1'";
             p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where bureau_id in (" + bureauIds + ") and year=" + year + " order by area_name");
         } else {//全部
             if (school_type_id == -1) {
+                if (StrKit.isBlank(area_id)) {
+                    p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' order by area_name");
+                } else {
                     p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' and area_id='" + area_id + "' order by area_name");
+                }
+
             } 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");