From 653aa18b7298cf09e74e144cc8dc093a79cfbfba Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 六月 2020 11:12:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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..3367332 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -63,12 +63,24 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
+ public static void main(String[] args) {
+ String s = "2020-06-11 00:00:00 - 2020-07-15 00:00:00";
+ if (s.contains(" - ")) {
+ String[] split = s.split(" - ");
+ for (String s1 : split) {
+ System.out.println(s1);
+ }
+ }
+ }
+
private void convert(Map<String, Object> map, EntityWrapper 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())));
+ } else if (String.valueOf(entry.getValue()).contains(RANGE_TIME_LINK)){
+ wrapper.ge(entry.getKey(), DateUtils.convert(String.valueOf(entry.getValue())));
} else {
wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
}
@@ -76,7 +88,7 @@
}
@RequestMapping(value = "/user/edit/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
public R edit(User user) {
if (Cools.isEmpty(user)){
return R.error();
@@ -90,14 +102,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 +129,7 @@
}
@RequestMapping(value = "/user/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
return R.error();
@@ -127,7 +139,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