From cb5ddf074d60b72e35ee4bafaec95530f53d1839 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期六, 09 十二月 2023 08:59:34 +0800
Subject: [PATCH] 12.9
---
guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/UserController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/UserController.java b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/UserController.java
index b06637b..6687aa8 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/UserController.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/UserController.java
@@ -1,6 +1,8 @@
package com.stylefeng.guns.modular.code.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.stylefeng.guns.core.base.tips.ErrorTip;
import com.stylefeng.guns.core.base.tips.Tip;
import com.stylefeng.guns.core.common.annotion.BussinessLog;
@@ -21,6 +23,7 @@
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.dto.Host;
+import com.stylefeng.guns.modular.system.dto.Medium;
import com.stylefeng.guns.modular.system.factory.UserFactory;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.IBannerService;
@@ -253,11 +256,15 @@
@ApiOperation(value = "查询管理员", tags = {"后台-系统设置"})
@GetMapping("/list")
@ResponseBody
- public Object list(String account, @RequestParam()int pageNo, @RequestParam()int pageSize,@RequestParam("1=平台管理员 2=员工") int version) {
- int index = (pageNo-1)*pageSize;
- int size = pageSize;
- List<Map<String, Object>> users = userService.getUsers(account,index,size,version);
- return users;
+ public Object list(String account, @RequestParam()int pageNo, @RequestParam()int pageSize) {
+// int index = (pageNo-1)*pageSize;
+// int size = pageSize;
+ PageHelper.startPage(pageNo,pageSize);
+
+ List<Map<String, Object>> users = userService.getUsers(account);
+ PageInfo<Map<String, Object>> info=new PageInfo<>(users);
+ System.err.println(info);
+ return info;
}
@@ -337,7 +344,7 @@
@ResponseBody
@GetMapping ("/text")
- @ApiOperation(value = "3系统公告....", tags = {"后台-基础信息管理"})
+ @ApiOperation(value = "3系统公告.4隐私5用户协议", tags = {"后台-基础信息管理"})
public List<Banner> text(){
Integer [] ids = {3,4,5};
return bannerService.selectList(new EntityWrapper<Banner>().in("position",ids));
@@ -356,7 +363,7 @@
@ResponseBody
@GetMapping ("/know/list")
- @ApiOperation(value = "列表", tags = {"后台-知识百科"})
+ @ApiOperation(value = "列表", tags = {"后台-知识百科"},response = EncyclopedicKnowledge.class)
public List<EncyclopedicKnowledge> list(Integer type, String title,@RequestParam int pageNo,@RequestParam int pageSize){
int index = (pageNo-1)*pageSize;
--
Gitblit v1.7.1