Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/resources/application-local.yml

@@ -2,7 +2,7 @@ spring:
   # 注册中心consul地址
   cloud:
     consul:
-      host: localhost # consul 所在服务地址
+      host: 192.168.11.13 # consul 所在服务地址
       port: 8500 # consul 服务端口
       discovery:
         # 是否启用服务发现
@@ -11,7 +11,7 @@ spring:
         register: false
         deregister: false
         ## consul ip地址
-        hostname: localhost
+        hostname: 192.168.11.13
         # 注册到consul的服务名称
         service-name: ${spring.application.name} # 服务提供者名称
         instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port} #实例ID

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

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="request.tenantId != null and request.tenantId != ''"> and tenant_id = #{request.tenantId} </if>
             <if test="request.inspectionCode!= null and request.inspectionCode != ''"> and inspection_code like concat('%', #{request.inspectionCode}, '%') </if>
             <if test="request.airportId != null and request.airportId != 0"> and airport_id = #{request.airportId} </if>
-            <if test="request.type != null and request.type != 0"> and type = #{request.type} </if>
+            <if test="request.type != null and (request.type == 0 or request.type == 1)"> and type = #{request.type} </if>
             <if test="request.deptIdList != null and request.deptIdList.size() > 0">
                 and dept_id in
                 <foreach item="deptId" collection="request.deptIdList" open="(" separator="," close=")">