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

admin

2019-09-27 6b75391e97aa770e12965ec6e542856df79e6de0

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java

@@ -30,16 +30,16 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

import com.yeshi.fanli.service.inter.count.UserInfoCountService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.user.UserRankService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -1124,8 +1124,12 @@
      if(list == null)

         list = new ArrayList<>();

      



      int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

      PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);



      JSONObject data = new JSONObject();

      data.put("count", count);

      data.put("pe", pe);

      data.put("list", list);

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

   }