From 4f43125773ea3f37bc19f92915c0a00d755712cf Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 16:04:40 +0800
Subject: [PATCH] 修改导办人员添加模板不允许选择部门 bug
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index d83f522..3d7f8d3 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -103,6 +103,9 @@
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
map.put("permission", user.getPermission());
+ map.put("userType", user.getUserType());
+ map.put("departmentId", user.getDepartmentId());
+ map.put("departmentName", user.getDepartmentName());
return ResultData.success(map);
}
@@ -129,6 +132,9 @@
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
map.put("permission", user.getPermission());
+ map.put("userType", user.getUserType());
+ map.put("departmentId", user.getDepartmentId());
+ map.put("departmentName", user.getDepartmentName());
return ResultData.success(map);
}
@@ -170,14 +176,15 @@
@GetMapping("/getlist")
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "keyword",required = false) String keyword)
{
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3");
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);
- int num=IUserService.selectNum("3");
+ int num=IUserService.selectNum("3",keyword);
return getDataTable(list,num);
}
@@ -223,7 +230,7 @@
config.setCreateBy(sysUser.getUserId()+"");
- config.setUserId(Snowflake.getId());
+ config.setUserId(Snowflake.getId()+"");
config.setUserType("3");
config.setCreateTime(LocalDateTime.now());
@@ -243,9 +250,9 @@
@Authorization
public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
{
- if(config.getUserId()==null)
+ if(config.getId()==null)
{
- return error("userId不能为空");
+ return error("Id不能为空");
}
if(StringUtils.isEmpty(config.getLoginName()))
@@ -332,8 +339,6 @@
{
return error("输入密码与原密码不能相同！");
}
-
-
return toAjax(IUserService.updateConfig(config));
}
--
Gitblit v1.7.1