bug修复;

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

@@ -975,6 +975,37 @@
         </if>
     </select>
 
+    <select id="userPersonalDriverAuthList" resultType="com.mhd.user.domain.userAggregate.repository.po.UserDriverPo">
+        select ud.driver_id,
+        u.user_id,
+        u.user_name,
+        u.user_phone,
+        u.user_account,
+        ude.user_driver_enterprise_id,
+        ude.driver_enterprise_name
+        from "USER" u
+        left join user_driver ud on ud.user_id = u.user_id and u.del_flag = 1
+        left join user_driver_enterprise ude
+        on u.user_id = ude.user_id and ude.del_flag = 1
+        where u.del_flag = 1 and u.role_code = 'driver'
+        <if test="createBy != null"> and u.create_by = #{createBy}</if>
+        <if test="createBy != null and organizationIdList == null">
+            and u.create_by = #{createBy}</if>
+        <if test="organizationIdList != null and createBy == null">
+            AND u.organization_id in
+            <foreach item="id" collection="organizationIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="organizationIdList != null and createBy != null">
+            AND (u.organization_id in
+            <foreach item="id" collection="organizationIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            OR u.create_by = #{createBy})
+        </if>
+    </select>
+
     <select id="motorcadeAuthCaptainList" resultType="java.util.HashMap">
         select u.user_id userId,
                u.top_organization_id topOrganizationId,

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

@@ -708,7 +708,7 @@
     </select>
 
     <select id="findAllShipperInfo" resultType="com.mhd.user.interfaces.vo.QueryAllShipperInfoVo">
-        SELECT u.user_id, u.user_name, u.user_area_address, u.user_area_county_id, u.user_area_name ,u.user_phone,u.has_default_address,b.shipper_id,b.shipper_enterprise_name
+        SELECT u.user_id, u.user_name, u.user_area_address, u.user_area_county_id, u.user_area_name ,u.user_phone,u.has_default_address,b.shipper_id,b.shipper_enterprise_name,u.DOCUMENT_PREPARER_NC_CODE
         FROM "USER" u
                  LEFT JOIN user_shipper b ON u.user_id = b.user_id
                  left join (select user_id, LISTAGG(r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS roleName