diff --git a/WebRoot/Excel/195a29f0-120d-41d2-beec-e227cedf065f.xlsx b/WebRoot/Excel/195a29f0-120d-41d2-beec-e227cedf065f.xlsx new file mode 100644 index 00000000..cdb0f5a0 Binary files /dev/null and b/WebRoot/Excel/195a29f0-120d-41d2-beec-e227cedf065f.xlsx differ diff --git a/WebRoot/Excel/33032d27-5181-4b78-8ea9-3168363c6a04.xlsx b/WebRoot/Excel/33032d27-5181-4b78-8ea9-3168363c6a04.xlsx new file mode 100644 index 00000000..a0e61917 Binary files /dev/null and b/WebRoot/Excel/33032d27-5181-4b78-8ea9-3168363c6a04.xlsx differ diff --git a/WebRoot/Excel/7881ba60-78cb-41ee-902d-b8e7417dba95.xlsx b/WebRoot/Excel/7881ba60-78cb-41ee-902d-b8e7417dba95.xlsx new file mode 100644 index 00000000..fcfc2c37 Binary files /dev/null and b/WebRoot/Excel/7881ba60-78cb-41ee-902d-b8e7417dba95.xlsx differ diff --git a/WebRoot/Excel/a60e34b9-f539-4b15-9ebc-f72b41e13ec9.xlsx b/WebRoot/Excel/a60e34b9-f539-4b15-9ebc-f72b41e13ec9.xlsx new file mode 100644 index 00000000..de5c5a09 Binary files /dev/null and b/WebRoot/Excel/a60e34b9-f539-4b15-9ebc-f72b41e13ec9.xlsx differ diff --git a/WebRoot/Excel/b36ca195-10fd-4511-a47c-86af7537faf3.xlsx b/WebRoot/Excel/b36ca195-10fd-4511-a47c-86af7537faf3.xlsx new file mode 100644 index 00000000..d63ddb18 Binary files /dev/null and b/WebRoot/Excel/b36ca195-10fd-4511-a47c-86af7537faf3.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index 30d7a698..bc3b1dcb 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/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; } /**