From 15fe445c820f28139e4e7e1a4cb286ad6ae37e6e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 06 六月 2022 11:05:17 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 258ac6a..11d7e6e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -1,7 +1,6 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.enums.RoleLevelStatus;
@@ -16,11 +15,14 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AdminBo;
import com.sandu.ximon.dao.bo.MenuNode;
-import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.domain.Admin;
+import com.sandu.ximon.dao.domain.AdminRoleRelation;
+import com.sandu.ximon.dao.domain.Role;
+import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -81,7 +83,7 @@
/**
* 娣诲姞绠＄悊鍛樻棩蹇楄褰曞紑濮�
*/
- String content = "鏂版敞鍐岀敤鎴凤細" + param.getUsername();
+ String content = "鏂版敞鍐岀鐞嗗憳锛�" + param.getUsername();
StoreOperationRecordsUtils.storeOperationData(null, null, "娣诲姞绠＄悊鍛�", content);
/**
* 娣诲姞绠＄悊鍛樻棩蹇楄褰曠粨鏉�
@@ -199,9 +201,42 @@
return updateById(one);
}
- public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword) {
+ public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.ADMIN_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.ADMIN_ID.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.ADMIN_CREATE_TIME.getCode();
+ break;
+ case 3:
+ orderByResult = OrderByEnums.ADMIN_LOGIN_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
if (baseConditionVO != null) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
}
return adminMapper.listAdmin(keyword);
--
Gitblit v1.9.3