wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-08-28 11:57:30 +08:00
parent 93a6715af9
commit 89d09f336e
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/sys/controller/SysUserController.java
View File

@ -84,11 +84,10 @@ public class SysUserController extends AbstractController {
String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex(); String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex();
//更新密码 //更新密码
boolean flag = sysUserService.updatePassword(getUserId(), password, newPassword); boolean flag = sysUserService.updatePassword(getUser(), password, newPassword);
if (!flag) { if (!flag) {
return R.error("原密码不正确"); return R.error("原密码不正确");
} }
return R.ok(); return R.ok();
} }

3
src/main/java/com/lz/modules/sys/service/SysUserService.java
View File

@ -11,6 +11,7 @@ package com.lz.modules.sys.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.lz.common.utils.PageUtils; import com.lz.common.utils.PageUtils;
import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.SysUserEntity;
import org.apache.catalina.User;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -62,7 +63,7 @@ public interface SysUserService extends IService<SysUserEntity> {
* @param password 原密码 * @param password 原密码
* @param newPassword 新密码 * @param newPassword 新密码
*/ */
boolean updatePassword(Long userId, String password, String newPassword); boolean updatePassword(SysUserEntity user, String password, String newPassword);
List<Long> queryMenuIdListByRoleId(Long roleId); List<Long> queryMenuIdListByRoleId(Long roleId);
} }

19
src/main/java/com/lz/modules/sys/service/impl/SysUserServiceImpl.java
View File

@ -13,7 +13,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lz.common.exception.RRException; import com.lz.common.exception.RRException;
import com.lz.common.utils.Constant; import com.lz.common.utils.Constant;
import com.lz.common.utils.PageUtils; import com.lz.common.utils.PageUtils;
import com.lz.modules.app.dao.StaffDao;
import com.lz.modules.app.dto.UserDto; import com.lz.modules.app.dto.UserDto;
import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.sys.dao.SysUserDao; import com.lz.modules.sys.dao.SysUserDao;
import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.entity.SysUserEntity;
import com.lz.modules.sys.service.SysRoleService; import com.lz.modules.sys.service.SysRoleService;
@ -46,6 +48,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
@Autowired @Autowired
private SysUserDao sysUserDao; private SysUserDao sysUserDao;
@Autowired
private StaffDao staffDao;
@Override @Override
public PageUtils queryPage(Map<String, Object> params) { public PageUtils queryPage(Map<String, Object> params) {
@ -126,11 +131,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
} }
@Override @Override
public boolean updatePassword(Long userId, String password, String newPassword) { public boolean updatePassword(SysUserEntity user, String password, String newPassword) {
if (user.getType() == 1) {
StaffEntity staffEntity = staffDao.selectStaffById(user.getUserId());
if (!staffEntity.getPassword().equals(password)) {
return false;
}
staffEntity.setPassword(newPassword);
staffDao.updateStaffById(staffEntity);
} else {
SysUserEntity userEntity = new SysUserEntity(); SysUserEntity userEntity = new SysUserEntity();
userEntity.setPassword(newPassword); userEntity.setPassword(newPassword);
return this.update(userEntity, return this.update(userEntity,
new QueryWrapper<SysUserEntity>().eq("user_id", userId).eq("password", password)); new QueryWrapper<SysUserEntity>().eq("user_id", user.getUserId()).eq("password", password));
}
return true ;
} }
@Override @Override