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 d5803098..d17253b8 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -2335,7 +2335,7 @@ public class CollectModel { */ public Page getOrgPersonList(String org_id, String keyword, int page, int limit) { Kv kv = Kv.by("org_id", org_id); - kv.set("keyword", keyword); + if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword); SqlPara sqlPara = Db.getSqlPara("Collect.getOrgPersonList", kv); Page pageRecord = Db.paginate(page, limit, sqlPara); return pageRecord; diff --git a/src/main/resource/Sql/Collect.sql b/src/main/resource/Sql/Collect.sql index 0983ee28..9e80a072 100644 --- a/src/main/resource/Sql/Collect.sql +++ b/src/main/resource/Sql/Collect.sql @@ -153,7 +153,10 @@ #end -- 获取指定部门下的人员信息列表,带分页 #sql("getOrgPersonList") - select * from t_sys_loginperson as t1 where t1.org_id=#para(org_id) and person_name like #para(keyword, "like") + select * from t_sys_loginperson as t1 where t1.org_id=#para(org_id) + #if(keyword) + and t1.person_name like #para(keyword, "like") + #end #end -- 获取当前登录人员所在单位下的+所在年级下所有班级 #sql("getClassList")