Merge remote-tracking branch 'origin/develop' into develop

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

@@ -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()