WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhaomeijing
2022-05-25 09:53:06 +08:00
parent e12f1ad7e5 97eaf907e2
commit 9f6c26bb42
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+8 -7
View File
@@ -172,7 +172,8 @@ public class SysUserController {
}
//@RequiresRoles({"admin"})
@RequiresPermissions("user:edit")
@ApiOperation(value = "用户管理-编辑")
@RequiresPermissions("sys:user:edit")
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>();
@@ -184,8 +185,8 @@ public class SysUserController {
} else {
SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
user.setUpdateTime(new Date());
String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
user.setPassword(passwordEncode);
// String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
// user.setPassword(passwordEncode);
// user.setPassword(sysUser.getPassword());
String roles = jsonObject.getString("selectedroles");
String departs = jsonObject.getString("selecteddeparts");
@@ -202,7 +203,7 @@ public class SysUserController {
}
@ApiOperation(value = "用户管理-角色配置")
@RequiresPermissions("user:role")
@RequiresPermissions("sys:user:role")
@RequestMapping(value = "/setRole", method = RequestMethod.POST)
public Result<SysUser> setRole(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>();
@@ -233,7 +234,7 @@ public class SysUserController {
}
@ApiOperation(value = "用户管理-部门配置")
@RequiresPermissions("user:depart")
@RequiresPermissions("sys:user:depart")
@RequestMapping(value = "/setDepart", method = RequestMethod.POST)
public Result<SysUser> setDepart(@RequestBody JSONObject jsonObject) {
Result<SysUser> result = new Result<SysUser>();
@@ -333,7 +334,7 @@ public class SysUserController {
return result;
}
@RequiresPermissions("sys:user:list")
@RequiresPermissions("sys:user:edit")
@RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
Result<List<String>> result = new Result<>();
@@ -405,7 +406,7 @@ public class SysUserController {
* @param userId
* @return
*/
@RequiresPermissions("sys:user:list")
@RequiresPermissions("sys:user:edit")
@RequestMapping(value = "/userDepartList", method = RequestMethod.GET)
public Result<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
Result<List<DepartIdModel>> result = new Result<>();