Merge branch 'dev_engineer_filter' into 'develop'

修改

See merge request !161

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java

@@ -242,9 +242,13 @@ public class EngineerServiceImpl implements EngineerService {
 		lqw.in(groupIds != null && !groupIds.isEmpty(), EngineerInfo::getGroupId, groupIds);
 		lqw.eq(kind != null && !kind.isEmpty(), EngineerInfo::getKind, (kind == "fullJob") ? 1 : 2);
 		if (key != null && !key.isEmpty()) {
-			lqw.or().like(EngineerInfo::getPhone, key);
-			lqw.or().like(EngineerInfo::getName, key);
-			lqw.or().like(EngineerInfo::getEngineerCode, key);
+			lqw.and(wrapper1 ->
+					wrapper1.like(EngineerInfo::getPhone, key)
+							.or()
+							.like(EngineerInfo::getName, key)
+							.or()
+							.like(EngineerInfo::getEngineerCode, key)
+			);
 		}
 		lqw.orderByAsc(EngineerInfo::getGroupId);
 		lqw.orderByAsc(EngineerInfo::getEngineerCode);