From fde11b2df8daa78889d765183695315fa361bd7b Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期三, 24 六月 2020 21:52:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 75f78c7..57d102e 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -63,20 +63,21 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/user/edit/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
public R edit(User user) {
if (Cools.isEmpty(user)){
return R.error();
@@ -90,14 +91,14 @@
}
@RequestMapping(value = "/user/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
userService.insert(user);
return R.ok();
}
@RequestMapping(value = "/user/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
public R update(User user){
if (Cools.isEmpty(user) || null==user.getId()){
return R.error();
@@ -117,7 +118,7 @@
}
@RequestMapping(value = "/user/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -127,7 +128,7 @@
}
@RequestMapping(value = "/user/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<User> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1