提交 3f9bada6 authored 作者: renjiancai's avatar renjiancai

--no commit message

上级 6bc75f3c
......@@ -23,6 +23,7 @@ import com.zrqx.core.enums.StatusEnum;
import com.zrqx.core.enums.sysuser.UserTypeEnum;
import com.zrqx.core.exception.BaseException;
import com.zrqx.core.exception.BusinessValidateException;
import com.zrqx.core.form.sysuser.bg.user.UpdatePasswordForm;
import com.zrqx.core.form.sysuser.fg.user.LoginForm;
import com.zrqx.core.form.sysuser.fg.user.LoginUserInfo;
import com.zrqx.core.model.sysuser.role.Role;
......@@ -149,4 +150,27 @@ public class FgPermissionsController {
}
throw new BusinessValidateException(2, "未查询到角色权限");
}
@ApiOperation(value = "账户安全-修改密码", notes = "0:成功;")
@PostMapping(value = "/update/password")
public CallBack<String> updatePassword(@RequestBody UpdatePasswordForm form) {
User user = userService.selectByPrimaryKey(redis.getMember().getUserId());
if (!user.getPassword().toLowerCase().equals(form.getOldPassword().toLowerCase())) {
throw new BaseException(1, "旧密码错误");
}
if(StringUtils.isBlank(form.getNewPassword1()) || StringUtils.isBlank(form.getNewPassword2())) {
throw new BaseException(2,"新密码不能为空。");
}
if (form.getNewPassword1().equals(form.getOldPassword())) {
throw new BaseException(4, "新密码不能与旧密码重复");
}
if (!form.getNewPassword1().equals(form.getNewPassword2())) {
throw new BaseException(3, "两次密码不一致");
}
User m = new User();
m.setUserId(user.getUserId());
m.setPassword(form.getNewPassword1());
userService.updateByPrimaryKeySelective(m);
return CallBack.success("成功");
}
}
......@@ -25,4 +25,11 @@ public interface FgUserMapper extends BaseMapper<User> {
*/
@Select("select departmentid from sys_user_department where userid = #{userId}")
List<Integer> getDeptIdByUserId(@Param("userId")String userId);
@Select("<script>"
+ " select count(id) from sys_User m "
+ " where 1=1 "
+ " eq(m.userId,userId) "
+ " eq(m.phone,phone) "
+ "</script>")
int isExist(String userId,String phone);
}
......@@ -21,4 +21,13 @@ public interface FgUserService extends BaseService<User,String> {
* @date: 2020年2月27日 下午3:56:13
*/
List<Integer> getDeptIdByUserId(String userId);
/**
* 判断是否存在
* @param userId
* @param phone
* @return
* @author rjc
* @date: 2020年11月10日 上午10:41:03
*/
boolean isExistByPhone(String userId, String phone);
}
......@@ -42,6 +42,12 @@ public class FgUserServiceImpl extends BaseServiceImpl<User,String> implements F
// TODO Auto-generated method stub
return mapper.getDeptIdByUserId(userId);
}
@Override
public boolean isExistByPhone(String userId, String phone) {
// TODO Auto-generated method stub
return mapper.isExist(userId, phone) > 0;
}
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论