Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 041f1a8a by 王力
Options

Merge branch 'dev_engineer_filter' into 'develop' 

修改

See merge request !161
2 parents 8a458707 71fb25ca
Inline Side-by-side
Showing with 7 additions and 3 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
...@@ -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!