jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 3 additions and 8 deletions

...	...	@@ -53,7 +53,6 @@
53	53
54	54	/**
55	55	* 更新密码
56		- * @param oldPwd
57	56	* @param newPwd
58	57	* @param userId
59	58	* @param httpServletRequest
60	59
...	...	@@ -61,11 +60,10 @@
61	60	@RequestMapping(value = "/updatePwd", method = RequestMethod.GET)
62	61	@ResponseBody
63	62	public BaseResponse updatePwd(
64		- @RequestParam("oldPwd") String oldPwd,
65	63	@RequestParam("newPwd") String newPwd,
66	64	@RequestParam("userId") Integer userId,
67	65	HttpServletRequest httpServletRequest) {
68		- return assistBuildFacade.updatePwd(userId, oldPwd, newPwd);
	66	+ return assistBuildFacade.updatePwd(userId, newPwd);
69	67
70	68	}
71	69

...	...	@@ -55,7 +55,7 @@
55	55	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(userModels);
56	56	}
57	57
58		- public BaseResponse updatePwd(Integer userId, String oldPwd, String newPwd) {
	58	+ public BaseResponse updatePwd(Integer userId, String newPwd) {
59	59
60	60	Map param = new HashMap<>();
61	61	param.put("id", userId);
...	...	@@ -64,10 +64,7 @@
64	64	if (CollectionUtils.isNotEmpty(userModels))
65	65	{
66	66	AssistBuildUserModel model = userModels.get(0);
67		- if (model == null \|\| !oldPwd.equals(model.getPassword()))
68		- {
69		- return new BaseResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("旧密码不对");
70		- }
	67	+
71	68	AssistBuildUserModel updateModel = new AssistBuildUserModel();
72	69	updateModel.setId(model.getId());
73	70	updateModel.setPassword(newPwd);