Commit 71fb25ca by wangli

修改

1 parent a200436d
...@@ -242,9 +242,13 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -242,9 +242,13 @@ public class EngineerServiceImpl implements EngineerService {
lqw.in(groupIds != null && !groupIds.isEmpty(), EngineerInfo::getGroupId, groupIds); lqw.in(groupIds != null && !groupIds.isEmpty(), EngineerInfo::getGroupId, groupIds);
lqw.eq(kind != null && !kind.isEmpty(), EngineerInfo::getKind, (kind == "fullJob") ? 1 : 2); lqw.eq(kind != null && !kind.isEmpty(), EngineerInfo::getKind, (kind == "fullJob") ? 1 : 2);
if (key != null && !key.isEmpty()) { if (key != null && !key.isEmpty()) {
lqw.or().like(EngineerInfo::getPhone, key); lqw.and(wrapper1 ->
lqw.or().like(EngineerInfo::getName, key); wrapper1.like(EngineerInfo::getPhone, key)
lqw.or().like(EngineerInfo::getEngineerCode, key); .or()
.like(EngineerInfo::getName, key)
.or()
.like(EngineerInfo::getEngineerCode, key)
);
} }
lqw.orderByAsc(EngineerInfo::getGroupId); lqw.orderByAsc(EngineerInfo::getGroupId);
lqw.orderByAsc(EngineerInfo::getEngineerCode); lqw.orderByAsc(EngineerInfo::getEngineerCode);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!