'commit'

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

@@ -1064,7 +1064,7 @@ public class ZbdcModel {
      * @return
      */
     public Map<String, Record> getSchoolAreaName() {
-        String sql = "select t1.org_id,t1.org_type_id,t1.parent_id,t2.area_id,t2.area_name from t_base_organization as t1 left join t_dm_area as t2 on t1.parent_id=t2.area_id where t1.org_id = t1.bureau_id and t1.school_type_id>0";
+        String sql = "select t1.org_id,t1.org_type_id,t1.parent_id,t2.area_id,t2.area_name from t_base_organization as t1 left join t_dm_area as t2 on t1.parent_id=t2.area_id where t1.org_id = t1.bureau_id and (t1.school_type_id>0 or t1.org_id='5CE95FA9-B866-473D-862F-55C813CCCA4C') ";
         List<Record> list = Db.find(sql);
         Map<String, Record> _map = new HashMap<>();
         for (Record record : list) {
@@ -1482,9 +1482,11 @@ public class ZbdcModel {
         Map<String, Record> _map = getSchoolAreaName();
         Record record = _map.get(bureau_id);
         if (bureau_id.equals("5CE95FA9-B866-473D-862F-55C813CCCA4C")) {
-            record.set("shi_master", true);
+            record.set("shi_master", 1);
+            record.set("area_id","5CE95FA9-B866-473D-862F-55C813CCCA4C");
+            record.set("area_name","市直");
         } else {
-            record.set("shi_master", false);
+            record.set("shi_master", 0);
         }
         return record;
     }