From f0376f72170c2eb236bec5560b8c5734edd222f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 31 Mar 2021 17:16:40 +0800
Subject: [PATCH] common模块： 增加了convert工具类，驼峰和下划线相互转换 更新了Date工具类，添加根据Date，day获取目标date的方法 更新WebUtils工具类，添加获取请求Ip方法 manage模块： 组织和后台用户增删改查模块全部完成 增加aop用作日志插入
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 8263599..fe6e20a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -21,7 +21,7 @@
import com.moral.api.mapper.MenuMapper;
import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserMapper;
-import com.moral.api.pojo.UserBo;
+import com.moral.api.pojo.UserBO;
import com.moral.api.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -60,13 +60,13 @@
private String AESKey;
@Override
- public UserBo selectUserInfo(Map<String, Object> parameters) {
+ public UserBO selectUserInfo(Map<String, Object> parameters) {
return userMapper.selectUserInfo(parameters);
}
@Override
public Map<String, Object> login(Map<String, Object> parameters) {
- UserBo userBo = selectUserInfo(parameters);
+ UserBO userBo = selectUserInfo(parameters);
Map<String, Object> result = new HashMap<>();
//������������
if (userBo == null) {
@@ -357,8 +357,8 @@
queryWrapper.like("wechat", wechat);
}
- int page = Integer.parseInt(parameters.get("page").toString());
- int size = Integer.parseInt(parameters.get("size").toString());
+ Integer page = (Integer) parameters.get("page");
+ Integer size = (Integer) parameters.get("size");
Page<User> pageData = new Page<>(page, size);
//������������,������id������
if (order == null) {
@@ -366,9 +366,8 @@
} else {
queryWrapper.orderByAsc(order.toString(), "id");
}
- Page<User> userPage = userMapper.selectPage(pageData, queryWrapper);
- pageData.setRecords(userPage.getRecords());
- return userPage;
+ userMapper.selectPage(pageData, queryWrapper);
+ return pageData;
}
}
--
Gitblit v1.8.0