From 012f80529db9aa5065f51bde3fd65ff1ffe9eb61 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 08:23:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/system/controller/UserController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 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 57d102e..11f0db4 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -83,6 +83,8 @@
return R.error();
}
if (null == user.getId()){
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
} else {
userService.updateById(user);
@@ -93,6 +95,8 @@
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
return R.ok();
}
@@ -100,6 +104,15 @@
@RequestMapping(value = "/user/update/auth")
@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();
}
@@ -113,17 +126,22 @@
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(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ userService.deleteById(id);
}
- userService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
}
--
Gitblit v1.9.1