Merge branch 'hotfix/pcBug'

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;
 

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<SysLogErrorDao, SysL
         String module = (String) params.get("module");
 
         QueryWrapper<SysLogErrorEntity> wrapper = new QueryWrapper<>();
-        wrapper.like(StringUtils.isNotBlank(module), "module", module);
+        wrapper.like(StringUtils.isNotBlank(module), "module", module).orderByDesc(FieldConstant.CREATE_DATE);
         return wrapper;
     }
 

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<SysUserDao, SysUserEntit
 
     @Override
     public List<SysUserDTO> list(Map<String, Object> params) {
+        //转换成like
+        paramsToLike(params, "username");
+        paramsToLike(params, "realname");
+        paramsToLike(params, "mobile");
+        paramsToLike(params, "email");
         //普通管理员，只能查询所属部门及子部门的数据
         UserDetail user = SecurityUser.getUser();
         if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) {