From f543faa7b485a9f752d5e6b2236d630682690cd4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 09:14:53 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
index 220a56a..83f6c38 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -20,7 +20,10 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
@RestController
@RequestMapping("/api")
@@ -38,7 +41,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
- return R.ok().add(userService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(userService.page(pageParam, pageParam.buildWrapper(true, wrapper -> wrapper.orderByAsc("create_time"))));
}
@PreAuthorize("hasAuthority('system:user:list')")
@@ -132,10 +135,12 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
}
- userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
- for (Long roleId : user.getRoleIds()) {
- if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ if (user.getRoleIds() != null && user.getRoleIds().length > 0) {
+ userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
+ for (Long roleId : user.getRoleIds()) {
+ if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
}
}
--
Gitblit v1.9.1