Skip to content

yangxiujun / paidan_demo

Go to a project
Commit e2b91c15 by 王力
Options

Merge branch 'dev_engineer_filter' into 'develop' 

修改

See merge request !162
2 parents 041f1a8a 4174c051
Inline Side-by-side
Showing with 4 additions and 1 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
...@@ -240,7 +240,10 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -240,7 +240,10 @@ public class EngineerServiceImpl implements EngineerService {
LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
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); if (kind != null && !key.isEmpty()) {
Integer k = (kind == "fullJob") ? 1 : 2;
lqw.eq(EngineerInfo::getKind, k);
}
if (key != null && !key.isEmpty()) { if (key != null && !key.isEmpty()) {
lqw.and(wrapper1 -> lqw.and(wrapper1 ->
wrapper1.like(EngineerInfo::getPhone, key) wrapper1.like(EngineerInfo::getPhone, key)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!