优化用户列表

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java

@@ -103,15 +103,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
         if (CollectionUtils.isEmpty(appUserManageVos)) {
             return  new PageInfo<AppUserManageVo>();
-        }else {
-            for (AppUserManageVo appUserManageVo : appUserManageVos) {
-                Integer parentId = appUserManageVo.getParentId();
-                AppUserManageVo parentUser = appUserLoginMapper.selectByParentId(parentId);
-                appUserManageVo.setNameOfSuperior(parentUser.getNameOfSuperior());
-                appUserManageVo.setSuperiorMobileNumber(parentUser.getSuperiorMobileNumber());
-            }
         }
-
         PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
         return getAppUserManageVoPageInfo(pageInfo);
     }
@@ -193,9 +185,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 
     public AppUserManageVo findUserInfoById(Integer userId) {
         AppUserManageVo appUserManageVo = new AppUserManageVo();
-        AppUserManageDTO appUserManageDTO = new AppUserManageDTO();
-        appUserManageDTO.setUserId(userId);
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(userId);
         if (CollectionUtils.isEmpty(appUserManageVos)){
             return appUserManageVo;
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

@@ -14,7 +14,7 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     //查询用户信息
      AppUserVo getUserInfo(@Param("userId") Integer userId);
 
-    List<AppUserManageVo> selectAppUserManage(AppUserManageDTO appUserManageDTO);
+    List<AppUserManageVo> selectAppUserManage(@Param("userId") Integer userId);
 
     void updateUserMemberStatusByUserId(@Param("userId") Integer userId,@Param("status") Integer status);
 

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

@@ -77,132 +77,67 @@
     </select>
 
 
-    <select id="selectAppUserManage" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO"
+    <select id="selectAppUserManage" parameterType="Integer"
             resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
-        select
-        l.id As userid,
-        l.username,
-        l.certification_status as certificationStatus,
-        l.id_number as idNumber,
-        l.createtime,
-        l.last_time as lastTime,
-        l.status,
-        d.channel,
-        d.is_member,
-        d.realname,
-        d.nickname,
-        d.source,
-        d.province_code as provinceCode,
-        d.city_code as cityCode,
-        d.sex,
-        d.headimgurl,
-        d.email,
-        m.member_level as memberLevel,
-        m.valid_time as validTime,
-        m.buy_count as buyCount,
-        m.total_number as totalNumber,
-        m.rent_free_days as rentFreeDays,
-        m.crt_time as timeOfMembership,
-        m.recent_recharge as recentRecharge,
-        m.name as memberName,
-        ul.username as inviter,
-        aup.name as `positionName`,
-        p.nameOfSuperior,
-        p.username AS superiorMobileNumber,
-        p.parent_id as parentId
-        from
-        app_user_login l
-        inner join
-        (select * from app_user_detail where 1=1
-        <if test="postionState != null">
-            <choose>
-                <when test="postionState == 6">
-                    and `position_id`=#{postionState}
-                </when>
-                <otherwise>
-                    and <![CDATA[`position_id`<>6]]>
-                </otherwise>
-            </choose>
-        </if>
-        ) d
-        on
-        d.userid = l.id
-        left join
-        app_user_login ul
-        on
-        ul.id=d.inviter_account
-        left join
-        (
-        select
-        b.*,
-        ml.name
-        from
-        base_user_member b
-        left join
-        base_user_member_level ml
-        on
-        ml.level = b.member_level
-        where
-        ml.isdel=0
-        ) m
-        on
-        l.id = m.user_id
-        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},'%')
-        </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="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
+	l.id AS userid,
+	l.username,
+	l.certification_status AS certificationStatus,
+	l.id_number AS idNumber,
+	l.createtime,
+	l.last_time AS lastTime,
+	l. STATUS,
+	d.channel,
+	d.is_member,
+	d.realname,
+	d.nickname,
+	d.source,
+	d.province_code AS provinceCode,
+	d.city_code AS cityCode,
+	d.sex,
+	d.headimgurl,
+	d.email,
+	m.valid_time AS validTime,
+	m.buy_count AS buyCount,
+	m.total_number AS totalNumber,
+	m.rent_free_days AS rentFreeDays,
+	m.crt_time AS timeOfMembership,
+	m.recent_recharge AS recentRecharge,
+	ml. NAME AS memberName,
+	aup. NAME AS `positionName`,
+	ul.username AS inviter,
+	IFNULL(pd.realname, pd.nickname) AS nameOfSuperior,
+	pl.username AS superiorMobileNumber
+    FROM
+	app_user_login l
+    LEFT JOIN app_user_detail 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
+    (
+	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.id = #{userId}
     </select>
 
     <update id="updateUserMemberStatusByUserId">
@@ -219,19 +154,26 @@
         d.channel,
         d.source,
         d.realname,
-        ml.name as memberName,
-        m.member_level AS memberLevel,
-        aup.name AS positionName,
-        r.parent_id AS parentId,
+        ml. NAME AS memberName,
+        aup. NAME AS positionName,
         m.crt_time AS timeOfMembership,
         m.total_number AS totalNumber,
         m.rent_free_days AS rentFreeDays,
-        m.member_level
+        IFNULL(pd.realname, pd.nickname) AS nameOfSuperior,
+        pl.username AS superiorMobileNumber
         FROM
         app_user_login l
-        INNER JOIN app_user_detail d ON d.userid = l.id
+        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 * from base_user_member_level where isdel=0 ) ml ON ml.level = m.member_level
+        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
@@ -242,6 +184,8 @@
         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
         <if test="mobile !=null and mobile !='' ">
@@ -291,5 +235,4 @@
     </select>
 
 
-
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -194,7 +194,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     orderPageVO.setMemberName(appUserVo.getMemberName());
                 }
 
-                if (dto.getType() == 1) {
+                if (dto.getType()!= null&&dto.getType() == 1) {
                     String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail();
                     ObjectMapper objectMapper = new ObjectMapper();
                     try {
@@ -247,7 +247,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
                             log.info("获取驾驶人信息失败！");
                             e.printStackTrace();
                         }
-
                     }
 
                 }