Merge branch 'dm_20251204' into dev

# Conflicts:
#	mhd-user-center/src/main/resources/mapper/UserMapper.xml
#	mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml

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

@@ -65,8 +65,8 @@
                a.esign_auth_status,
                a.esign_enterprise_status,
                a.esign_seal_auth_id
-        FROM `user_shipper` a
-                 LEFT JOIN `user` b ON a.user_id = b.user_id
+        FROM user_shipper a
+                 LEFT JOIN "USER" b ON a.user_id = b.user_id
         WHERE a.del_flag = 1
           AND b.del_flag = 1
     </sql>
@@ -139,6 +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
                  LEFT JOIN `user_shipper` b ON a.user_id = b.user_id
@@ -186,15 +190,15 @@
         SELECT
         b.shipper_id,
         a.user_id,
-        GROUP_CONCAT(r.role_code) AS roleCode,
+        WM_CONCAT(r.role_code) AS roleCode,
         b.shipper_fill,
         b.shipper_enterprise_fill,
         a.business_type
         FROM
-        `user` a
-        LEFT JOIN `user_shipper` b ON b.user_id = a.user_id
+        user a
+        LEFT JOIN user_shipper b ON b.user_id = a.user_id
         LEFT JOIN user_role ur ON b.user_id = ur.user_id
-        LEFT JOIN `role` r ON ur.role_id = r.role_id
+        LEFT JOIN role r ON ur.role_id = r.role_id
         AND r.del_flag = 1
         WHERE
         a.del_flag = 1
@@ -346,8 +350,8 @@
         select
         sum(case when us.shipper_fill = 2 then 1 end)
         +
-        sum(case when us.shipper_enterprise_fill = 2 then 1 end) as `count`
-        from user u
+        sum(case when us.shipper_enterprise_fill = 2 then 1 end) as count
+        from "USER" u
         left join user_shipper us on u.user_id = us.user_id
         <where>
             u.del_flag = 1
@@ -378,11 +382,4 @@
         and esign_enterprise_status = #{userShipperEntity.esignEnterpriseStatus}
     </select>
 
-    <select id="getShipperSummaryData" parameterType="java.lang.Long"
-            resultType="com.mhd.common.core.domain.po.UserShipperPo">
-        <include refid="selectShipperVo1"/>
-        and b.user_id = #{value}
-        group by b.user_id
-    </select>
-
 </mapper>