解决代码冲突

2025-12-06 22:17:12 +08:00
parent 2a1e542704
commit 0f8f3de71b
1 changed files with 2 additions and 6 deletions
@@ -139,14 +139,10 @@
 			    b.monthly_settlement_flag,
 			    a.user_auth_status,
               b.original_receipt_flag,
-               b.freight_node
-        FROM "USER" a
-                 LEFT JOIN user_shipper b ON a.user_id = b.user_id
-                 left join (select user_id, LISTAGG(DISTINCT r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS roleName
               b.freight_node,b.customer_nc_code
-        FROM `user` a
+        FROM "USER" a
                 LEFT JOIN `user_shipper` b ON a.user_id = b.user_id
-                 left join (select user_id, GROUP_CONCAT(r.role_name separator '&amp;') roleName
+                                left join (select user_id, LISTAGG(DISTINCT r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS roleName
                            from role r
                                     left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1
                            where r.del_flag = 1