选择车队不一致修改

mhd-user-center/src/main/resources/mapper/MotorcadeMapper.xml

@@ -380,31 +380,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by u.user_id
     </select>
     <select id="queryNonePagingList"  resultType="com.mhd.user.domain.motorcade.repository.po.MotorcadePo">
-        SELECT
+        SELECT DISTINCT
             m.motorcade_id,
-            m.motorcade_name
+            m.motorcade_name,
+            m.organization_id,
+            m.organization_name
         FROM
             motorcade m
-                LEFT JOIN
+                INNER JOIN
             motorcade_driver d
             ON m.motorcade_id = d.motorcade_id and d.del_flag = 1
+                INNER JOIN
+            user_driver ud
+            ON d.user_id = ud.user_id and ud.del_flag = 1
+                LEFT JOIN
+            user_driver_enterprise ude
+            ON ud.user_id = ude.user_id and ude.del_flag = 1
         <where>
             m.del_flag = 1
             <!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
             <if test="organizationId != null">
                 <!-- 如果设置了 organizationId，添加 organization_id 条件 -->
                 and m.organization_id = #{organizationId}
-                and m.organization_name IS NOT NULL
-            </if>
-            <if test="topOrganizationId != null">
-                <!-- 如果设置了 topOrganizationId，添加 top_organization_id 条件 -->
-                and m.top_organization_id = #{topOrganizationId}
-                <if test="organizationId == null">
-                    <!-- 如果没有设置 organizationId，添加 organization_name IS NOT NULL 条件 -->
-                    and m.organization_name IS NOT NULL
-                </if>
             </if>
         </where>
+        ORDER BY m.motorcade_id
     </select>
 
 </mapper>