diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java
index ce8bbda..1e282b6 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmEmployeesController.java
@@ -26,6 +26,7 @@ import com.aircraft.modules.security.service.OnlineUserService;
 import com.aircraft.modules.security.service.UserDetailsServiceImpl;
 import com.aircraft.modules.security.service.dto.AuthUserDto;
 import com.aircraft.modules.security.service.dto.JwtUserDto;
+import com.aircraft.modules.system.domain.EmArea;
 import com.aircraft.modules.system.domain.EmEmployees;
 import com.aircraft.modules.system.domain.User;
 import com.aircraft.modules.system.domain.dto.EmEmployeesQueryCriteria;
@@ -40,6 +41,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 
+import java.util.Collections;
 import java.util.HashMap;
 
 import org.springframework.http.HttpStatus;
@@ -157,4 +159,14 @@ public class EmEmployeesController {
         return new ResponseEntity<>(records,HttpStatus.OK);
     }
 
+    @ApiOperation(value = "条件查询全部飞行员")
+    @RequestMapping(value = "all", method = RequestMethod.GET)
+    public ResponseEntity<Object> all(EmEmployees example) {
+        List<EmEmployees> entitys = emEmployeesService.list(example);
+        if (null != entitys) {
+            return new ResponseEntity<>(entitys, HttpStatus.OK);
+        }
+        return new ResponseEntity<>(Collections.emptyList(), HttpStatus.OK);
+    }
+
 }
\ No newline at end of file
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java
index ec753a0..377dfa1 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/EmEmployeesService.java
@@ -15,6 +15,7 @@
 */
 package com.aircraft.modules.system.service;
 
+import com.aircraft.modules.system.domain.EmArea;
 import com.aircraft.modules.system.domain.EmEmployees;
 import com.aircraft.modules.system.domain.dto.EmEmployeesQueryCriteria;
 
@@ -122,4 +123,11 @@ public interface EmEmployeesService extends IService<EmEmployees> {
      * @param encryptPassword 密码
      */
     void updatePass(String username, String encryptPassword);
+
+    /**
+     * 条件查询
+     * @param example
+     * @return
+     */
+    List<EmEmployees> list(EmEmployees example);
 }
\ No newline at end of file
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java
index 5a31ad7..7dce40b 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmEmployeesServiceImpl.java
@@ -109,6 +109,11 @@ public class EmEmployeesServiceImpl extends ServiceImpl<EmEmployeesMapper, EmEmp
         userCacheManager.cleanEmployeesCache(username);
     }
 
+    @Override
+    public List<EmEmployees> list(EmEmployees example) {
+        return this.list(buildWrapper(example));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(EmEmployees resources) {
@@ -159,6 +164,22 @@ public class EmEmployeesServiceImpl extends ServiceImpl<EmEmployeesMapper, EmEmp
         return wrapper;
     }
 
+    /**
+     * 构建查询
+     *
+     * @param example
+     * @return
+     */
+    private QueryWrapper<EmEmployees> buildWrapper(EmEmployees example) {
+        String name = example.getName();
+        QueryWrapper<EmEmployees> wrapper = new QueryWrapper<>();
+        wrapper.lambda()
+                .like(StringUtils.isNotEmpty(name), EmEmployees::getName, name)
+                .eq(EmEmployees::getAreaId,example.getAreaId())
+                .eq(BaseEntity::getDelFlag,0);
+        return wrapper;
+    }
+
     @Override
     public List<EmEmployees> findByScenicId(Long areaId) {
         QueryWrapper<EmEmployees> wrapper = new QueryWrapper<>();