Commit 6663bf07 authored by 王夏晖's avatar 王夏晖

密码重置,权限菜单完善

parent 505231d0
...@@ -53,9 +53,9 @@ public class LoginController extends PaginationController<SysUser> { ...@@ -53,9 +53,9 @@ public class LoginController extends PaginationController<SysUser> {
@ApiOperation(value = "修改密码") @ApiOperation(value = "修改密码")
@ApiImplicitParams({@ApiImplicitParam(name = "newPassWord", value = "新密码", required = true, dataType = "varchar",paramType = "body"), @ApiImplicitParams({@ApiImplicitParam(name = "newPassWord", value = "新密码", required = true, dataType = "varchar",paramType = "body"),
@ApiImplicitParam(name = "oldPassWord", value = "旧密码", required = true, dataType = "varchar",paramType = "body")}) @ApiImplicitParam(name = "oldPassWord", value = "旧密码", required = true, dataType = "varchar",paramType = "body")})
@PutMapping(value = "/updatePassWord") @RequestMapping(value = "/updatePassWord")
@ResponseBody @ResponseBody
public Result updatePassWord(@RequestBody String newPassWord, @RequestBody String oldPassWord){ public Result updatePassWord(@RequestParam String newPassWord, @RequestParam String oldPassWord){
String userId = UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID); String userId = UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID);
int flag = userService.updatePassWord(newPassWord, oldPassWord, userId); int flag = userService.updatePassWord(newPassWord, oldPassWord, userId);
return Result.builder(new PersistModel(flag)); return Result.builder(new PersistModel(flag));
...@@ -68,7 +68,7 @@ public class LoginController extends PaginationController<SysUser> { ...@@ -68,7 +68,7 @@ public class LoginController extends PaginationController<SysUser> {
@ApiImplicitParams({@ApiImplicitParam(name = "needUserId", value = "需要修改密码的用户的ID", required = true, dataType = "varchar",paramType = "body")}) @ApiImplicitParams({@ApiImplicitParam(name = "needUserId", value = "需要修改密码的用户的ID", required = true, dataType = "varchar",paramType = "body")})
@ResponseBody @ResponseBody
@PutMapping(value = "/resetPassWord") @PutMapping(value = "/resetPassWord")
public Result resetPassWord(@RequestBody String needUserId){ public Result resetPassWord(@RequestParam String needUserId){
String userId = UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID); String userId = UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID);
int flag = userService.resetPassWord(userId, needUserId); int flag = userService.resetPassWord(userId, needUserId);
return Result.builder(new PersistModel(flag)); return Result.builder(new PersistModel(flag));
......
...@@ -337,6 +337,7 @@ public class UserServiceImpl implements UserService { ...@@ -337,6 +337,7 @@ public class UserServiceImpl implements UserService {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("id",tmap.get("MENU_ID")); map.put("id",tmap.get("MENU_ID"));
map.put("label",tmap.get("MENU_NM")); map.put("label",tmap.get("MENU_NM"));
map.put("url",tmap.get("MENU_URL"));
result.add(map); result.add(map);
} }
} }
...@@ -347,6 +348,7 @@ public class UserServiceImpl implements UserService { ...@@ -347,6 +348,7 @@ public class UserServiceImpl implements UserService {
if(tmap.get("MENU_PID")!=null && tmap.get("MENU_PID").toString().equals(pid)){ if(tmap.get("MENU_PID")!=null && tmap.get("MENU_PID").toString().equals(pid)){
Map<String, Object> m = new HashMap<>(); Map<String, Object> m = new HashMap<>();
m.put("id",tmap.get("MENU_ID")); m.put("id",tmap.get("MENU_ID"));
m.put("url",tmap.get("MENU_URL"));
m.put("label",tmap.get("MENU_NM")); m.put("label",tmap.get("MENU_NM"));
childList.add(m); childList.add(m);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment