'commit'

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

@@ -1316,7 +1316,7 @@ public class CollectModel {
             kv.set("idList", idList);
         }
 
-        if(target_type_id>0) kv.set("target_type_id",target_type_id);
+        if (target_type_id > 0) kv.set("target_type_id", target_type_id);
 
         SqlPara sqlPara = Db.getSqlPara("Collect.viewJobList", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
@@ -2315,7 +2315,7 @@ public class CollectModel {
      */
     public List<Record> getOrgList(String bureau_id, String keyword) {
         Kv kv = Kv.by("bureau_id", bureau_id);
-        kv.set("keyword", keyword);
+        if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
         SqlPara sqlPara = Db.getSqlPara("Collect.getOrgList", kv);
         return Db.find(sqlPara);
     }

src/main/resource/Sql/Collect.sql

@@ -146,7 +146,10 @@
 
     -- 获取指定单位下的部门列表
     #sql("getOrgList")
-        select * from t_base_organization where bureau_id=#para(bureau_id) and org_name like #para(keyword, "like")
+        select * from t_base_organization where bureau_id=#para(bureau_id)
+        #if(keyword)
+            and org_name like #para(keyword, "like")
+        #end
     #end
     -- 获取指定部门下的人员信息列表，带分页
     #sql("getOrgPersonList")