From c31bf5a8902485b750b5814a0d1c54ecc65d2c96 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 31 八月 2024 10:12:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 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..11f0db4 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -63,25 +63,28 @@
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();
}
if (null == user.getId()){
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
} else {
userService.updateById(user);
@@ -90,15 +93,26 @@
}
@RequestMapping(value = "/user/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
return R.ok();
}
@RequestMapping(value = "/user/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
public R update(User user){
+ if (getUserId() != 9527){
+ if (!getUserId().equals(user.getId())){
+ Role role = roleService.selectById(getUser().getRoleId());
+ if (!role.getCode().equals("admin")){
+ return R.error("鎿嶄綔瓒婃潈锛�");
+ }
+ }
+ }
+
if (Cools.isEmpty(user) || null==user.getId()){
return R.error();
}
@@ -112,22 +126,27 @@
if (user.getMobile()!=null) {
entity.setMobile(user.getMobile());
}
- userService.updateById(entity);
+ if (user.getRoleId()!=null){
+ entity.setRoleId(user.getRoleId());
+ }
+ if (!userService.updateById(entity)){
+ return R.error("淇敼澶辫触锛�");
+ }
+
return R.ok();
}
@RequestMapping(value = "/user/delete/auth")
- @ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ userService.deleteById(id);
}
- userService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
}
@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