Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/dao/EngineerInfoDao.java

@@ -21,5 +21,12 @@ public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integ
 
     List<EngineerInfoEntity> findByEngineerCodeIn(List<String> engineerCodes);
 
-    Page<EngineerInfoEntity> findAllByEngineerCodeIn(List<String> engineerCodes, Specification<EngineerInfoEntity> engineerInfoEntitySpecification, Pageable pageable);
+    default Page<EngineerInfoEntity> findAllByEngineerCodeIn(List<String> engineerCodes, Specification<EngineerInfoEntity> engineerInfoEntitySpecification, Pageable pageable) {
+        Specification<EngineerInfoEntity> spec = Specification.where(engineerCodeIn(engineerCodes)).and(engineerInfoEntitySpecification);
+        return findAll(spec, pageable);
+    }
+
+    static Specification<EngineerInfoEntity> engineerCodeIn(List<String> engineerCodes) {
+        return (root, query, criteriaBuilder) -> root.get("engineerCode").in(engineerCodes);
+    }
 }