Merge branch 'wanjing' into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/enums/code/inspection/QueryInspectionPageListCodeEnum.java

@@ -13,7 +13,8 @@ public enum QueryInspectionPageListCodeEnum {
 
     QUERY_IS_FAILED(1230400, "获取数据失败"),
     DEPT_ID_IS_NULL(1230401, "部门id为空"),
-    DEPT_IS_NOT_EXIST(1230402, "部门不存在");
+    DEPT_IS_NOT_EXIST(1230402, "部门不存在"),
+    DATA_IS_FAILED(1230403, "获取数据为空");
 
     /**
      * 错误码

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionPageListService.java

@@ -128,7 +128,7 @@ public class QueryInspectionPageListService {
 
         if (null == pageData || pageData.getTotal() == 0) {
             log.info("获取任务分页列表为空");
-            return JsonResult.error(QueryInspectionPageListCodeEnum.QUERY_IS_FAILED.getCode(), QueryInspectionPageListCodeEnum.QUERY_IS_FAILED.getMsg());
+            return JsonResult.success(null, QueryInspectionPageListCodeEnum.DATA_IS_FAILED.getMsg());
         }
 
         // 构造返回结果对象

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml

@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="1 == 1"> and mark = 1 </if>
             <if test="request.code != null and request.code != ''"> and code like concat('%', #{request.code}, '%') </if>
-            <if test="request.airportId != null and request.airportId != 0"> and airport_id = #{request.inspectionLine} </if>
+            <if test="request.airportId != null and request.airportId != 0"> and airport_id = #{request.airportId} </if>
             <if test="request.inspectionLine != null and request.inspectionLine != 0"> and inspection_line = #{request.inspectionLine} </if>
             <if test="request.type != null and request.type != 0"> and type = #{request.type} </if>
             <if test="request.status != null and request.status != 0"> and status = #{request.status} </if>