From 8c17b715d2afa9b79af0bb205245a59ab7110852 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Tue, 4 Aug 2020 16:27:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=AF=BC=E5=87=BA=E9=A1=BA=E5=BA=8F=E5=92=8C?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=B0=83=E6=95=B4=E3=80=91=E9=AD=8F=E5=87=AF?= =?UTF-8?q?=202020-07-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/excel/SysLogOperationExcel.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogOperationExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogOperationExcel.java index 9f1c807bc..aade6c42d 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogOperationExcel.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/SysLogOperationExcel.java @@ -36,13 +36,12 @@ public class SysLogOperationExcel { private String requestParams; @Excel(name = "请求时长(毫秒)") private Integer requestTime; - @Excel(name = "User-Agent") - private String userAgent; - @Excel(name = "操作IP") - private String ip; @Excel(name = "状态", replace = {"失败_0", "成功_1"}) private Integer status; - + @Excel(name = "操作IP") + private String ip; + @Excel(name = "User-Agent") + private String userAgent; @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss") private Date createDate; From 2aa8b96f7a8a559763e5d8b57aacf69f828d73c1 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Wed, 5 Aug 2020 10:24:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=AF=BC=E5=87=BA=E9=A1=BA=E5=BA=8F=E5=92=8C?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=B0=83=E6=95=B4=E3=80=91=E9=AD=8F=E5=87=AF?= =?UTF-8?q?=202020-07-03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/SysLogErrorServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysLogErrorServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysLogErrorServiceImpl.java index 44de12132..de5e6c288 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysLogErrorServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysLogErrorServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dao.SysLogErrorDao; @@ -55,7 +56,7 @@ public class SysLogErrorServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(module), "module", module); + wrapper.like(StringUtils.isNotBlank(module), "module", module).orderByDesc(FieldConstant.CREATE_DATE); return wrapper; } From e5eb2b1cbc87d7b365168451dcd2251db6db1d94 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Wed, 5 Aug 2020 11:08:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4=E3=80=91?= =?UTF-8?q?=E9=AD=8F=E5=87=AF=202020-08-05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/SysUserServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index f931903c2..c300b1e2f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -88,6 +88,11 @@ public class SysUserServiceImpl extends BaseServiceImpl list(Map params) { + //转换成like + paramsToLike(params, "username"); + paramsToLike(params, "realname"); + paramsToLike(params, "mobile"); + paramsToLike(params, "email"); //普通管理员，只能查询所属部门及子部门的数据 UserDetail user = SecurityUser.getUser(); if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) {