From 20004f666ec4568ba161a112cb6d955dedc1014a Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 12:48:17 +0800
Subject: [PATCH] ##
---
src/main/java/zy/cloud/wms/system/controller/UserController.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/system/controller/UserController.java b/src/main/java/zy/cloud/wms/system/controller/UserController.java
index 01fe02b..39dfd66 100644
--- a/src/main/java/zy/cloud/wms/system/controller/UserController.java
+++ b/src/main/java/zy/cloud/wms/system/controller/UserController.java
@@ -35,11 +35,11 @@
@RequestMapping(value = "/user/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<User> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -69,10 +69,10 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ 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]));
@@ -82,12 +82,15 @@
}
}
-
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
+ Long hostId = getHostId();
+ if(!Cools.isEmpty(hostId)){
+ user.setHostId(hostId);
+ }
user.setNickname(user.getUsername());
- if (userService.selectCount(new EntityWrapper<User>().eq("mobile", user.getMobile()))>0) {
+ if (userService.selectCount(new EntityWrapper<User>().eq("mobile", user.getMobile())) > 0) {
return R.error("鎵嬫満鍙峰凡瀛樺湪");
}
user.setStatus(1);
@@ -98,8 +101,8 @@
@RequestMapping(value = "/user/update/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
- public R update(User user){
- if (Cools.isEmpty(user) || null==user.getId()){
+ public R update(User user) {
+ if (Cools.isEmpty(user) || null == user.getId()) {
return R.error();
}
int count = userService.selectCount(new EntityWrapper<User>().ne("id", user.getId()).eq("username", user.getUsername()));
@@ -113,11 +116,11 @@
@RequestMapping(value = "/user/delete/auth")
@ManagerAuth
@Transactional
- public R deleteBatch(@RequestParam(value = "ids[]") Long[] ids){
- if (Cools.isEmpty((Object) ids)){
+ public R deleteBatch(@RequestParam(value = "ids[]") Long[] ids) {
+ if (Cools.isEmpty((Object) ids)) {
return R.error();
}
- for (Long id : ids){
+ for (Long id : ids) {
if (!userService.deleteById(id)) {
throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
@@ -127,7 +130,7 @@
@RequestMapping(value = "/user/export/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<User> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
@@ -143,7 +146,7 @@
wrapper.like("username", condition);
Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (User user : page.getRecords()){
+ for (User user : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", user.getId());
map.put("value", user.getNickname());
@@ -152,4 +155,5 @@
return R.ok(result);
}
+
}
--
Gitblit v1.9.1