|
|
@@ -9,7 +9,6 @@ import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.enums.EnumMallUserStatus; |
|
|
import com.iformall.enums.EnumMallUserStatus; |
|
|
import com.iformall.enums.EnumUserAdmin; |
|
|
import com.iformall.enums.EnumUserAdmin; |
|
|
import com.iformall.enums.EnumFlowPermissionType; |
|
|
|
|
|
import com.iformall.service.*; |
|
|
import com.iformall.service.*; |
|
|
import com.iformall.shiro.PasswordHelper; |
|
|
import com.iformall.shiro.PasswordHelper; |
|
|
import com.iformall.shiro.UserSession; |
|
|
import com.iformall.shiro.UserSession; |
|
|
@@ -17,7 +16,6 @@ import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
import org.apache.commons.collections.map.HashedMap; |
|
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.shiro.SecurityUtils; |
|
|
import org.apache.shiro.SecurityUtils; |
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.Logger; |
|
|
@@ -27,7 +25,6 @@ import org.springframework.util.Assert; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
import java.util.HashMap; |
|
|
import java.util.HashMap; |
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@@ -72,10 +69,6 @@ public class MallUserInfoController extends BaseController { |
|
|
public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { |
|
|
public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { |
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); |
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); |
|
|
|
|
|
|
|
|
if(userInfo.getWithWechatNotFormat() != null){ |
|
|
|
|
|
userInfo.setWithWechatForQuery(userInfo.getWithWechatNotFormat()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
userInfo.setTenantId(getTenantId()); |
|
|
userInfo.setTenantId(getTenantId()); |
|
|
userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); |
|
|
userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); |
|
|
final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); |
|
|
final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); |
|
|
|