Merge remote-tracking branch 'origin/dev' into dev

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

@@ -191,4 +191,9 @@ public class AppUserManageVo {
      * 上级手机号
      */
     private String superiorMobileNumber;
+
+    /**
+     * 注册时间
+     */
+    private Long createtime;
 }

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

@@ -157,38 +157,13 @@
         d.channel,
         d.source,
         d.realname,
-        ml. NAME AS memberName,
-        aup. NAME AS positionName,
-        m.crt_time AS timeOfMembership,
-        m.total_number AS totalNumber,
-        m.rent_free_days AS rentFreeDays,
-        IFNULL(pd.realname, pd.nickname) AS nameOfSuperior,
-        pl.username AS superiorMobileNumber
+        l.createtime,
+        l.status,
+        d.headimgurl,
+        d.nickname
         FROM
         app_user_login l
         LEFT JOIN app_user_detail d ON d.userid = l.id
-        LEFT JOIN base_user_member m ON d.userid = m.user_id
-        LEFT JOIN (
-        SELECT
-        LEVEL,
-        NAME
-        FROM
-        base_user_member_level
-        WHERE
-        isdel = 0
-        ) ml ON m.member_level = ml. LEVEL
-        LEFT JOIN app_user_position aup ON aup.id = d.position_id
-        LEFT JOIN (
-        SELECT
-        user_id,
-        parent_id
-        FROM
-        app_user_relation
-        WHERE
-        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
         WHERE
         l.isdel = 0
         and
@@ -196,49 +171,25 @@
         <if test="mobile !=null and mobile !='' ">
             and l.username like CONCAT('%',#{mobile},'%')
         </if>
-        <if test="channel !=null ">
-            and d.channel=#{channel}
-        </if>
-        <if test="memberLevel !=null and memberLevel != -1">
-            and m.member_level = #{memberLevel}
-        </if>
-        <if test="memberLevel == -1">
-            and m.member_level in (select level from base_user_member_level)
-        </if>
         <if test="registrationTimeBegin !=null  ">
             and l.createtime &gt;= #{registrationTimeBegin}
         </if>
         <if test="registrationTimeEnd !=null ">
             and l.createtime &lt;= #{registrationTimeEnd}
         </if>
-        <if test="source !=null  ">
-            and d.source = #{source}
-        </if>
+
         <if test="userId!=null">
             and l.id=#{userId}
         </if>
         <if test="status != null">
             and l.status = #{status}
         </if>
-        <if test="postionState != null">
-            <choose>
-                <when test="postionState == 6">
-                    and d.position_id =#{postionState}
-                </when>
-                <otherwise>
-                    and <![CDATA[d.`position_id`<>6]]>
-                </otherwise>
-            </choose>
+        <if test="nickname !=null and  nickname != ''">
+            and d.nickname like CONCAT('%',#{nickname},'%')
         </if>
         <if test="realName !=null and  realName != ''">
             and d.realname like CONCAT('%',#{realName},'%')
         </if>
-        <if test="citySet != null ">
-            and d.city_code in
-            <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         order by l.id ASC
     </select>