From 109af646c863e5c6a2ac2fa5eefdffa9fe86d252 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 20 四月 2022 14:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 53 +++++++++++++++++++++++++----------------------------
1 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index e42a384..296b992 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -1,12 +1,9 @@
package com.sandu.ximon.admin.controller;
-import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
@@ -19,8 +16,6 @@
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.dto.AdminDto;
-import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
@@ -165,30 +160,32 @@
if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
- if (keyword != null) {
- wrapper.like(Admin::getNickName, keyword)
- .or(adminLambdaQueryWrapper -> {
- adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
- });
- }
- List<Admin> list = adminService.list(wrapper);
+ return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
- List<AdminDto> adminDtoList = new ArrayList<>();
- for (Admin demo : list) {
- AdminDto adminDto = new AdminDto();
- BeanUtil.copyProperties(demo, adminDto);
- AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
- .eq(AdminRoleRelation::getAdminId, demo.getId()));
-
- if (one != null) {
- adminDto.setRoleId(one.getRoleId());
- }
- adminDtoList.add(adminDto);
-
- }
- return ResponseUtil.successPage(adminDtoList);
+// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+// LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
+// if (keyword != null) {
+// wrapper.like(Admin::getNickName, keyword)
+// .or(adminLambdaQueryWrapper -> {
+// adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
+// });
+// }
+// List<Admin> list = adminService.list(wrapper);
+//
+// List<AdminDto> adminDtoList = new ArrayList<>();
+// for (Admin demo : list) {
+// AdminDto adminDto = new AdminDto();
+// BeanUtil.copyProperties(demo, adminDto);
+// AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
+// .eq(AdminRoleRelation::getAdminId, demo.getId()));
+//
+// if (one != null) {
+// adminDto.setRoleId(one.getRoleId());
+// }
+// adminDtoList.add(adminDto);
+//
+// }
+// return ResponseUtil.successPage(adminDtoList);
}
@Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
--
Gitblit v1.9.3