|
|
@ -182,6 +182,9 @@ public class PublicController extends BaseController { |
|
|
if (StringUtils.isNoneBlank(study.getLeaderName())) { |
|
|
if (StringUtils.isNoneBlank(study.getLeaderName())) { |
|
|
queryWrapper.like("leader_name", study.getLeaderName()); |
|
|
queryWrapper.like("leader_name", study.getLeaderName()); |
|
|
} |
|
|
} |
|
|
|
|
|
if (study.getLeader()!=null&&study.getLeader().longValue()>0) { |
|
|
|
|
|
queryWrapper.eq("leader", study.getLeader()); |
|
|
|
|
|
} |
|
|
List<Study> list = studyService.list(queryWrapper); |
|
|
List<Study> list = studyService.list(queryWrapper); |
|
|
return getDataTable(list); |
|
|
return getDataTable(list); |
|
|
} |
|
|
} |
|
|
|