Commit d776f781 by 王力

Merge branch 'dev_engineer_filter' into 'develop'

Dev engineer filter

See merge request !170
2 parents 1114efed 3fb08783
......@@ -242,8 +242,10 @@ public class EngineerServiceImpl implements EngineerService {
LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
lqw.in(groupIds != null && !groupIds.isEmpty(), EngineerInfo::getGroupId, groupIds);
lqw.eq(kind != null && !kind.isEmpty(), EngineerInfo::getKind, (kind.equals("fullJob")) ? 1 : 2);
if (key != null && !key.isEmpty()) {
if(StringUtils.isNotEmpty(kind)) {
lqw.eq(EngineerInfo::getKind, (kind.equals("fullJob")) ? 1 : 2);
}
if (StringUtils.isNotEmpty(key)) {
lqw.and(w ->
w.like(EngineerInfo::getPhone, key)
.or()
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!