Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

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

@@ -67,6 +67,9 @@
         left JOIN th_section se ON sr.section_id=se.id
         left JOIN th_road rd ON sr.road_id=rd.id
         where sr.mark=1 and se.mark=1 and rd.mark=1
+        <if test="request.tenantId != null and request.tenantId != ''">
+            AND sr.tenant_id = #{request.tenantId}
+        </if>
         <if test="request.structureName !=null and request.structureName !=''">
             AND sr.`structure_name` like concat('%',#{request.structureName},'%')
         </if>