|
@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
|
|
+import org.jeecg.modules.hpposition.entity.Position;
|
|
|
import org.jeecg.modules.user.entity.User;
|
|
import org.jeecg.modules.user.entity.User;
|
|
|
import org.jeecg.modules.user.service.IUserService;
|
|
import org.jeecg.modules.user.service.IUserService;
|
|
|
|
|
|
|
@@ -78,6 +79,33 @@ public class UserController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
|
|
+ * 重写分页
|
|
|
|
|
+ * @param user
|
|
|
|
|
+ * @param pageNo
|
|
|
|
|
+ * @param pageSize
|
|
|
|
|
+ * @param req
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @AutoLog(value = "用户审核-分页列表查询")
|
|
|
|
|
+ @ApiOperation(value = "用户审核-分页列表查询", notes = "用户审核-分页列表查询")
|
|
|
|
|
+ @GetMapping(value = "/list_new")
|
|
|
|
|
+ public Result<Page<User>> queryPageListNew(User user,
|
|
|
|
|
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
|
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
|
+ HttpServletRequest req) {
|
|
|
|
|
+ Result<Page<User>> result = new Result<Page<User>>();
|
|
|
|
|
+ Page<User> pageList = new Page<User>(pageNo,pageSize);
|
|
|
|
|
+ pageList = userService.queryPageListNew(pageList,user);//通知公告消息
|
|
|
|
|
+ log.info("查询当前页:"+pageList.getCurrent());
|
|
|
|
|
+ log.info("查询当前页数量:"+pageList.getSize());
|
|
|
|
|
+ log.info("查询结果数量:"+pageList.getRecords().size());
|
|
|
|
|
+ log.info("数据总数:"+pageList.getTotal());
|
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
|
+ result.setResult(pageList);
|
|
|
|
|
+ return result;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
* 添加
|
|
* 添加
|
|
|
*
|
|
*
|
|
|
* @param user
|
|
* @param user
|