Merge branch '_dev_yh' into dev

yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -62,25 +62,28 @@
         credit.name_en as credit_level_name_en,
         ec.name_zh as country_name,
         (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
-        from (select a.*,
-        c.name                                     as default_contact_name,
-        concat(c.area_code, c.phone_new, '') as default_contact_phone,
-        (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
-        s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
-        c.phone_new as contactPhone,
-        c.id as defaultContactId,
-        c.social                                   as default_social,
-        c.email                                    as default_email,
-        c.social_number                            as default_social_number,
-        c.userid                                   as contact_member_id,
-        su.nickname as customer_service_name,
-        su.dept_id as dept_id,
-        (SELECT GROUP_CONCAT(name) FROM ecw_customer_competitor n WHERE FIND_IN_SET(n.id,(SELECT competitor_ids FROM ecw_customer WHERE id=a.id))) AS competitor_names,
-        su.creator as create_username
-        from ecw_customer a
-        left join (select * from ecw_customer_contacts where is_default = 1 and deleted = 0) as c on a.id = c.customer_id
-        left join system_user su    on a.customer_service = su.id
-        where a.deleted = 0) contact
+        from (
+            select a.*,
+            c.name                                     as default_contact_name,
+            concat(c.area_code, c.phone_new, '') as default_contact_phone,
+            (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
+            s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
+            c.phone_new as contactPhone,
+            c.id as defaultContactId,
+            c.social                                   as default_social,
+            c.email                                    as default_email,
+            c.social_number                            as default_social_number,
+            c.userid                                   as contact_member_id,
+            su.nickname as customer_service_name,
+            su.dept_id as dept_id,
+            (SELECT GROUP_CONCAT(name) FROM ecw_customer_competitor n WHERE FIND_IN_SET(n.id,(SELECT competitor_ids FROM ecw_customer WHERE id=a.id))) AS competitor_names,
+            su2.creator as create_username
+            from ecw_customer a
+            left join (select * from ecw_customer_contacts where is_default = 1 and deleted = 0) as c on a.id = c.customer_id
+            left join system_user su    on a.customer_service = su.id
+            left join system_user su2    on a.creator = su2.id
+            where a.deleted = 0
+        ) contact
         left join ecw_customer_level level
         on contact.level = level.id
         left join ecw_customer_credit credit