Merge branch 'master_admin0117' of...

Merge branch 'master_admin0117' of http://113.105.137.151:22280/youjj/cloud-platform into master_admin0117

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -110,7 +110,7 @@
 	pl.username AS superiorMobileNumber
     FROM
 	app_user_login l
-    LEFT JOIN app_user_detail d ON d.userid = l.id
+    LEFT JOIN (select * from  app_user_detail where channel > 0) d ON d.userid = l.id
     LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
     LEFT JOIN base_user_member m ON d.userid = m.user_id
     LEFT JOIN
@@ -163,7 +163,7 @@
         pl.username AS superiorMobileNumber
         FROM
         app_user_login l
-        LEFT JOIN app_user_detail d ON d.userid = l.id
+        LEFT JOIN (select * from  app_user_detail where channel>0) d ON d.userid = l.id
         LEFT JOIN base_user_member m ON d.userid = m.user_id
         LEFT JOIN (
         SELECT
@@ -185,7 +185,7 @@
         is_del = 0
         ) r ON l.id = r.user_id
         LEFT JOIN app_user_login pl ON r.parent_id = pl.id
-        LEFT JOIN app_user_detail pd ON pl.id = pd.userid
+        LEFT JOIN app_user_detail  pd ON pl.id = pd.userid
         WHERE
         l.isdel = 0
         <if test="mobile !=null and mobile !='' ">