|
@@ -1,6 +1,5 @@
|
|
package com.ruoyi.web.controller.platform;
|
|
package com.ruoyi.web.controller.platform;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
@@ -11,7 +10,10 @@ import com.ruoyi.system.domain.UserInfo;
|
|
import com.ruoyi.system.service.UserAddressService;
|
|
import com.ruoyi.system.service.UserAddressService;
|
|
import com.ruoyi.system.service.UserInfoService;
|
|
import com.ruoyi.system.service.UserInfoService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 用户信息Controller
|
|
* 用户信息Controller
|
|
@@ -34,8 +36,12 @@ public class UserInfoController extends BaseController {
|
|
// @PreAuthorize("@ss.hasPermi('system:info:list')")
|
|
// @PreAuthorize("@ss.hasPermi('system:info:list')")
|
|
@PostMapping("/list")
|
|
@PostMapping("/list")
|
|
public R<IPage<UserInfo>> list(@RequestBody BaseParam param) {
|
|
public R<IPage<UserInfo>> list(@RequestBody BaseParam param) {
|
|
- IPage<UserInfo> userInfoIPage = userInfoService.page(new Page<UserInfo>().setCurrent(param.getCurrent()).setSize(param.getSize()),
|
|
|
|
- new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getDelFlag,0));
|
|
|
|
|
|
+ Page<UserInfo> page = new Page<>(param.getCurrent(), param.getSize());
|
|
|
|
+ IPage<UserInfo> userInfoIPage = userInfoService.getUserInfoList(page,null);
|
|
|
|
+// IPage<UserInfo> userInfoIPage = userInfoService.page(new Page<UserInfo>().setCurrent(param.getCurrent()).setSize(param.getSize()),
|
|
|
|
+// new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getDelFlag,0));
|
|
|
|
+
|
|
|
|
+ //新加用户创建时间 用户地址的经纬度
|
|
return R.ok(userInfoIPage);
|
|
return R.ok(userInfoIPage);
|
|
}
|
|
}
|
|
|
|
|