Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/common/EngineerUtil.java

@@ -63,7 +63,7 @@ public class EngineerUtil {
 
     public Page<EngineerInfoEntity> findEngineersByKeyAndPage(List<String> engineerCodes, String key, Integer page, Integer size) {
         Pageable pageable = PageRequest.of(page - 1, size);
-        return engineerInfoDao.findAllByEngineerCodeIn(buildSpecification(key), engineerCodes, pageable);
+        return engineerInfoDao.findAllByEngineerCodeIn(engineerCodes, buildSpecification(key), pageable);
     }
 
 

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

@@ -21,5 +21,5 @@ public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integ
 
     List<EngineerInfoEntity> findByEngineerCodeIn(List<String> engineerCodes);
 
-    Page<EngineerInfoEntity> findAllByEngineerCodeIn(Specification<EngineerInfoEntity> engineerInfoEntitySpecification, List<String> engineerCodes, Pageable pageable);
+    Page<EngineerInfoEntity> findAllByEngineerCodeIn(List<String> engineerCodes, Specification<EngineerInfoEntity> engineerInfoEntitySpecification, Pageable pageable);
 }