Merge remote-tracking branch 'origin/master' into master-member-feture-count

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserManageVo.java

@@ -171,4 +171,19 @@ public class AppUserManageVo {
      * 身份信息
      */
     private String positionName;
+
+    /**
+     * 上级名称
+     */
+    private String nameOfSuperior;
+
+    /**
+     * 上级id
+     */
+    private Integer parentId;
+
+    /**
+     * 上级手机号
+     */
+    private String superiorMobileNumber;
 }

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

@@ -82,7 +82,10 @@
         m.recent_recharge as recentRecharge,
         m.name as memberName,
         ul.username as inviter,
-        aup.name as `positionName`
+        aup.name as `positionName`,
+        p.nameOfSuperior,
+        p.username AS superiorMobileNumber,
+        p.parent_id as parentId
         from
         app_user_login l
         inner join
@@ -123,6 +126,23 @@
         left join
         `app_user_position` as aup
         on aup.id = d.position_id
+        left join (
+        SELECT
+        r.user_id,
+        r.parent_id,
+        l.username,
+        IFNULL(d.realname,d.nickname) as nameOfSuperior
+        FROM
+        app_user_relation r
+        LEFT JOIN app_user_login l ON r.parent_id = l.id
+        LEFT JOIN app_user_detail d ON l.id = d.userid
+        WHERE
+        l.isdel = 0
+        AND
+        r.is_del = 0
+        ) p
+        on
+        l.id=p.user_id
         where l.isdel = 0
         <if test="mobile !=null and mobile !='' ">
             and l.username like CONCAT('%',#{mobile},'%')