diff --git a/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java b/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java index 97119ceb..4dc2ccbf 100644 --- a/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java +++ b/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java @@ -35,10 +35,13 @@ public class TaihuTalentController { public R getTaihuTalents(@RequestBody Map params){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(StringUtils.isNotEmpty(params.get("name").toString()),TaihuTalent::getName,params.get("name")); - wrapper.like(StringUtils.isNotEmpty(params.get("department").toString()),TaihuTalent::getDepartment,params.get("department")); + if (params.containsKey("department")){ + wrapper.like(StringUtils.isNotEmpty(params.get("department").toString()),TaihuTalent::getDepartment,params.get("department")); + } wrapper.like(StringUtils.isNotEmpty(params.get("region").toString()),TaihuTalent::getRegion,params.get("region")); wrapper.orderByAsc(TaihuTalent::getCreateTime); List list = taihuTalentService.list(wrapper); + //按职称排序 List titleList = Arrays.asList("主任","副主任","主治医师"); list = list.stream().sorted((taihuTalent1,taihuTalent2)->{ for (String str:titleList){