diff --git a/WebRoot/Excel/292228d4-5e13-4584-866c-ddb7078b7079.xlsx b/WebRoot/Excel/292228d4-5e13-4584-866c-ddb7078b7079.xlsx new file mode 100644 index 00000000..0a082dde Binary files /dev/null and b/WebRoot/Excel/292228d4-5e13-4584-866c-ddb7078b7079.xlsx differ diff --git a/WebRoot/Excel/632ed3a1-734b-476b-ac0e-3779c9331ab4.xlsx b/WebRoot/Excel/632ed3a1-734b-476b-ac0e-3779c9331ab4.xlsx new file mode 100644 index 00000000..7958379d Binary files /dev/null and b/WebRoot/Excel/632ed3a1-734b-476b-ac0e-3779c9331ab4.xlsx differ diff --git a/WebRoot/Excel/a574429d-0335-4fa5-8d96-8b691eedbbcd.xlsx b/WebRoot/Excel/a574429d-0335-4fa5-8d96-8b691eedbbcd.xlsx new file mode 100644 index 00000000..6b6ca485 Binary files /dev/null and b/WebRoot/Excel/a574429d-0335-4fa5-8d96-8b691eedbbcd.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 690a1965..8992f158 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -1151,10 +1151,8 @@ public class CollectModel { idList.add(s); } Kv kv = Kv.by("idList", idList); - SqlPara sqlPara = Db.getSqlPara("collect.getGroup", kv); + SqlPara sqlPara = Db.getSqlPara("Collect.getGroup", kv); List list = Db.find(sqlPara); return list; } - - } \ No newline at end of file diff --git a/src/main/resource/Sql/Collect.sql b/src/main/resource/Sql/Collect.sql index 761b9c3a..ba914b8f 100644 --- a/src/main/resource/Sql/Collect.sql +++ b/src/main/resource/Sql/Collect.sql @@ -66,7 +66,6 @@ #end -- 获取组内单位ids #sql("getGroup") - select org_id as bureau_id,org_name as bureau_name from - t_base_organization where org_id in #para(idList, "in") + select org_id as bureau_id,org_name as bureau_name from t_base_organization where org_id in #para(idList, "in") #end #end