'commit'

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

@@ -515,8 +515,19 @@ public class CollectModel {
      * @return
      */
     public Record getBureauAreaInfo(String bureau_id) {
-        String sql = "select t1.area_id,t2.area_name  from t_base_organization as t1 inner join t_dm_area as t2 on t1.area_id=t2.area_id where t1.org_id=?";
-        return Db.findFirst(sql, bureau_id);
+        String sql = "select t1.area_id  from t_base_organization as t1 where t1.org_id=?";
+        String area_id = Db.findFirst(sql, bureau_id).getStr("area_id");
+        Record record = new Record();
+        if (area_id.equals("00000000-0000-0000-0000-000000000000")) {
+            record.set("area_id", area_id);
+            record.set("area_name", "");
+        } else {
+            sql = "select area_name  from t_dm_area where area_id=?";
+            String area_name = Db.findFirst(sql, area_id).getStr("area_name");
+            record.set("area_id", area_id);
+            record.set("area_name", area_name);
+        }
+        return record;
     }
 
     /**