|
@@ -5,14 +5,11 @@ import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.ServletOutputStream;
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
-import cn.hutool.core.util.NumberUtil;
|
|
|
-import cn.hutool.core.util.RandomUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.crypto.SecureUtil;
|
|
|
import cn.hutool.poi.excel.ExcelUtil;
|
|
@@ -20,18 +17,13 @@ import cn.hutool.poi.excel.ExcelWriter;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import com.txz.cif.enums.BizTypeEnum;
|
|
|
-import com.txz.cif.util.IpUtils;
|
|
|
-import com.txz.cif.web.bo.UserBo;
|
|
|
import com.txz.cif.web.bo.UserBo2;
|
|
|
import com.txz.cif.web.bo.UserDetailBo;
|
|
|
-import com.txz.cif.web.bo.UserInfoBO;
|
|
|
import com.txz.cif.web.para.*;
|
|
|
import com.txz.cif.core.*;
|
|
|
import com.txz.cif.model.*;
|
|
|
import com.txz.cif.service.*;
|
|
|
-import com.txz.cif.core.AuthService;
|
|
|
import io.swagger.annotations.*;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import tk.mybatis.mapper.entity.Condition;
|
|
@@ -304,8 +296,8 @@ public class UserController extends AbstractApiController {
|
|
|
List<List<Object>> rows = new LinkedList<>();
|
|
|
if (CollUtil.isNotEmpty(users)) {
|
|
|
for (User temp : users) {
|
|
|
- List<Object> rowA = CollUtil.newArrayList(temp.getId(), temp.getUserNo(), temp.getInvitedCode(),temp.getNickname()
|
|
|
- ,temp.getName(),temp.getBank(),temp.getBankAccount(),temp.getBankAccountName(),temp.getPhoneNo(),temp.getVipLevel(),temp.getMemo(),temp.getHasWithdraw(),temp.getHasLogin(),temp.getHasOrder(), DateUtil.format(temp.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ List<Object> rowA = CollUtil.newArrayList(temp.getId()+"", temp.getUserNo(), temp.getInvitedCode(),temp.getNickname()
|
|
|
+ ,temp.getName(),temp.getBank(),temp.getBankAccount(),temp.getBankAccountName(),temp.getPhoneNo(),temp.getVipLevel()+"",temp.getMemo(),temp.getHasWithdraw()+"",temp.getHasLogin()+"",temp.getHasOrder()+"", DateUtil.format(temp.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
rows.add(rowA);
|
|
|
}
|
|
|
}
|