From dd62520d2b9a10d494d0ad08995e3a9406e1154c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 18:03:27 +0800
Subject: [PATCH] 修改回复模板 其他附件管理列表显示数据不全问题
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 4623353..87f4b83 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
@@ -113,6 +113,7 @@
map.put("userType", user.getUserType());
map.put("departmentId", user.getDepartmentId());
map.put("departmentName", user.getDepartmentName());
+ map.put("moreDepartmentIds", user.getMoreDepartmentIds());
return ResultData.success(map);
}
@@ -148,6 +149,7 @@
map.put("userType", user.getUserType());
map.put("departmentId", user.getDepartmentId());
map.put("departmentName", user.getDepartmentName());
+ map.put("moreDepartmentIds", user.getMoreDepartmentIds());
return ResultData.success(map);
}
@@ -195,9 +197,9 @@
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",keyword,null);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,null,keyword,null,"1");
- int num=IUserService.selectNum("3",keyword,null);
+ int num=IUserService.selectNum(null,keyword,null,"1");
return getDataTable(list,num);
}
@@ -246,7 +248,7 @@
config.setUserId(user.getUserId());
config.setCreateBy(user.getUserId()+"");
config.setUserType("3");
-
+ config.setIsDivisionHead("1");
config.setUpdateTime(LocalDateTime.now());
return toAjax(IUserService.updateConfig(config));
}
@@ -264,7 +266,7 @@
config.setUserId(user2.getUserId());
config.setCreateBy(user2.getUserId()+"");
config.setUserType("3");
-
+ config.setIsDivisionHead("1");
config.setUpdateTime(LocalDateTime.now());
return toAjax(IUserService.updateConfig(config));
}
@@ -278,6 +280,7 @@
config.setCreateBy(sysUser.getUserId()+"");
config.setUserId(Snowflake.getId()+"");
config.setUserType("3");
+ config.setIsDivisionHead("1");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
@@ -305,8 +308,6 @@
{
return error("账户不能为空");
}
-
- config.setUserType("3");
config.setUpdateBy(sys.getUserId()+"");
@@ -395,7 +396,7 @@
*
* @return 结果
*/
- @ApiOperation("获取登录人员信息")
+ @ApiOperation(value = "获取登录人员信息,userType=1 为超级管理员 isDivisionHead=1 为部门领导",response = SysUser.class)
@PostMapping("/getLoginInformation")
@Authorization
public ResultData getLoginInformation(@CurrentUser SysUser sysUse)
@@ -406,5 +407,15 @@
+ @ApiOperation("切换部门接口")
+ @GetMapping(value = "/switch/department")
+ public ResultData switchDepartment(@RequestParam(value = "departmentId",required = false) String departmentId,
+ @CurrentUser SysUser sysUse)
+ {
+ sysUse.setDepartmentId(departmentId);
+ return toAjax(IUserService.updateConfig(sysUse));
+ }
+
+
}
--
Gitblit v1.7.1