From 6bf8ed658baf5adba5e7a42313d6d40df4102fcc Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Thu, 2 Apr 2020 14:17:59 +0800
Subject: [PATCH] =?UTF-8?q?partymember=E7=BC=96=E8=AF=91bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/resi-mine/resi-mine-server/pom.xml             | 6 ------
 .../resi-partymember/resi-partymember-server/pom.xml        | 6 ------
 .../service/impl/PartyMemberConfirmServiceImpl.java         | 4 ++--
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index 27f935166a..b212d3a44b 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -82,12 +82,6 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>resi-partymember-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
index c86652bf6b..460f436997 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml
@@ -81,12 +81,6 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-user-server</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index ab94cf8369..06e0be913f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -1,10 +1,10 @@
 package com.epmet.modules.partymember.service.impl;
 
+import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
-import com.epmet.constant.UserConstant;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
@@ -157,7 +157,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
-			userRole.setRoleKey(UserConstant.ROLE_PARTYMEMBER);
+			userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
 			epmetUserFeignClient.saveUserRole(userRole);
 			//存入党员注册关系表  用于统计客户网格的认证党员数
 			saveRegisterRelation(partyMemberInfoDTO);