From 148e969ee538e704216dadbe50012e1e5e414cb3 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 26 May 2020 15:51:19 +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

---
 epmet-user/epmet-user-server/deploy/docker-compose-dev.yml      | 2 +-
 epmet-user/epmet-user-server/pom.xml                            | 2 +-
 .../main/java/com/epmet/service/impl/OperUserServiceImpl.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
index 0b78290865..de780efaad 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.46
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.47
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 52fe2fbf8b..eb144f2af0 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.46</version>
+    <version>0.3.47</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
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 0e6120e9f5..a33f95bbbb 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
@@ -111,7 +111,7 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
         insert(entity);
 
         //更新角色用户关系
-        operRoleUserFeignClient.saveOrUpdate(entity.getId(),dto.getRoleIdList());
+        operRoleUserFeignClient.saveOrUpdate(userEntity.getId(),dto.getRoleIdList());
     }
 
     @Override