用户导出

platform-admin/src/main/java/com/platform/service/impl/TbCfUserInfoServiceImpl.java

@@ -10,6 +10,7 @@ import com.platform.utils.excel.ExcelExport;
 import com.platform.utils.excel.ExcelImport;
 import com.platform.vo.Network;
 import com.platform.vo.StatisticalVo;
+import com.sun.xml.internal.messaging.saaj.soap.GifDataContentHandler;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -272,15 +273,11 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
 
         List<Object[]> list1 = new ArrayList<Object[]>();
 
-
-        List<TbCfUserInfoEntity> users;
-        if (userIds == null || userIds.length == 0) {
-            //查询符合条件的用户
-            users = tbCfUserInfoDao.getUserList(map);
-        } else {
-            //查询勾选的用户
-            users = tbCfUserInfoDao.getUsers(userIds);
+        if (userIds != null && userIds.length > 0) {
+            map.put("ids", userIds);
         }
+        //查询符合条件的用户
+        List<TbCfUserInfoEntity> users = tbCfUserInfoDao.getUserList(map);
 
 
         String[] header = new String[]{"账号", "昵称", "国家", "注册来源", "注册时间", "电话号码", "邮箱", "性别", "facebook账号"};

platform-admin/src/main/resources/com/platform/dao/TbCfUserInfoDao.xml

@@ -56,37 +56,37 @@
 		where user_id = #{id}
 </select>
 
-    <select id="getUsers" resultType="com.platform.entity.TbCfUserInfoEntity">
-        select
-        `user_id`,
-        `user_no`,
-        `user_type`,
-        `account`,
-        `avatar`,
-        `nick`,
-        `phone`,
-        `phone_flag`,
-        `password`,
-        `last_login_time`,
-        `last_login_ip`,
-        `login_count`,
-        `email`,
-        `facebook`,
-        `create_time`,
-        `sex`,
-        `default_address_id`,
-        `invited_user_id`,
-        `invited_count`,
-        `enable_flag`,
-        `email_flag`,
-        country,
-        source
-        from tb_cf_user_info
-        where user_id in
-        <foreach item="userId" collection="array" open="(" separator="," close=")">
-            #{userId}
-        </foreach>
-    </select>
+    <!--    <select id="getUsers" resultType="com.platform.entity.TbCfUserInfoEntity">-->
+    <!--        select-->
+    <!--        `user_id`,-->
+    <!--        `user_no`,-->
+    <!--        `user_type`,-->
+    <!--        `account`,-->
+    <!--        `avatar`,-->
+    <!--        `nick`,-->
+    <!--        `phone`,-->
+    <!--        `phone_flag`,-->
+    <!--        `password`,-->
+    <!--        `last_login_time`,-->
+    <!--        `last_login_ip`,-->
+    <!--        `login_count`,-->
+    <!--        `email`,-->
+    <!--        `facebook`,-->
+    <!--        `create_time`,-->
+    <!--        `sex`,-->
+    <!--        `default_address_id`,-->
+    <!--        `invited_user_id`,-->
+    <!--        `invited_count`,-->
+    <!--        `enable_flag`,-->
+    <!--        `email_flag`,-->
+    <!--        country,-->
+    <!--        source-->
+    <!--        from tb_cf_user_info-->
+    <!--        where user_id in-->
+    <!--        <foreach item="userId" collection="array" open="(" separator="," close=")">-->
+    <!--            #{userId}-->
+    <!--        </foreach>-->
+    <!--    </select>-->
 
     <select id="getUserList" resultType="com.platform.entity.TbCfUserInfoEntity">
         select
@@ -118,6 +118,13 @@
         <if test="startTime != null and endTime != ''">
             AND create_time between #{startTime} and #{endTime}
         </if>
+        <if test="ids!=null">
+            AND user_id in
+            <foreach item="userId" collection="ids" open="(" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
+        order by create_time desc
     </select>
     <!--查询每日注册量-->
     <select id="getDailyRegistered" resultType="com.platform.vo.StatisticalVo">