From ede4fe038134fa6376582a2ae2bc92097ec19cff Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 26 May 2020 16:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/OperUserServiceImpl.java   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
index e7cd4a7444..3d3e0c986e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java
@@ -124,18 +124,11 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
     public void update(OperUserDTO dto) {
         OperUserEntity entity = ConvertUtils.sourceToTarget(dto, OperUserEntity.class);
 
-        //密码加密
-        if(StringUtils.isBlank(dto.getPassword())){
-            entity.setPassword(null);
-        }else{
-            String password = PasswordUtils.encode(entity.getPassword());
-            entity.setPassword(password);
-        }
-
+        entity.setPassword(null);
         updateById(entity);
 
         //更新角色用户关系
-        operRoleUserFeignClient.saveOrUpdate(entity.getId(),dto.getRoleIdList());
+        operRoleUserFeignClient.saveOrUpdate(entity.getUserId(),dto.getRoleIdList());
     }
 
     @Override