编辑用户不修改密码

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysUserServiceImpl.java

@@ -192,9 +192,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				MsgUtils.getMessage(ErrorCodes.SYS_USER_UPDATE_PASSWORDERROR));
 
 		SysUser sysUser = new SysUser();
-		if (StrUtil.isNotBlank(userDto.getNewpassword1())) {
+		/*if (StrUtil.isNotBlank(userDto.getNewpassword1())) {
 			sysUser.setPassword(ENCODER.encode(userDto.getNewpassword1()));
-		}
+		}*/
 		sysUser.setPhone(userDto.getPhone());
 		sysUser.setUserId(userVO.getUserId());
 		sysUser.setAvatar(userDto.getAvatar());
@@ -215,9 +215,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		BeanUtils.copyProperties(userDto, sysUser);
 		sysUser.setUpdateTime(LocalDateTime.now());
 
-		if (StrUtil.isNotBlank(userDto.getPassword())) {
+		/*if (StrUtil.isNotBlank(userDto.getPassword())) {
 			sysUser.setPassword(ENCODER.encode(userDto.getPassword()));
-		}
+		}*/
 		this.updateById(sysUser);
 
 		sysUserRoleMapper