|
|
@ -106,7 +106,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi |
|
|
public List<SjListDto> queryPublicList(SjSearchListForm form) { |
|
|
public List<SjListDto> queryPublicList(SjSearchListForm form) { |
|
|
QueryWrapper<Sj> queryWrapper = Wrappers.query(); |
|
|
QueryWrapper<Sj> queryWrapper = Wrappers.query(); |
|
|
queryWrapper.eq("s.del_flag", 0); |
|
|
queryWrapper.eq("s.del_flag", 0); |
|
|
queryWrapper.and(p -> p.apply("(s.zjzt = #{0} OR (s.zjzt IS NULL AND s.study_form_id = #{1}))" |
|
|
|
|
|
|
|
|
queryWrapper.and(p -> p.apply("(s.zjzt = {0} OR (s.zjzt IS NULL AND s.study_form_id = {1}))" |
|
|
, ZjztEnum.rk.getValue(), form.getStudyFormId())); |
|
|
, ZjztEnum.rk.getValue(), form.getStudyFormId())); |
|
|
if(StringUtils.isNotEmpty(form.getMc())) { |
|
|
if(StringUtils.isNotEmpty(form.getMc())) { |
|
|
queryWrapper.like("s.mc", form.getMc()); |
|
|
queryWrapper.like("s.mc", form.getMc()); |
|
|
|