From 3719d4d0076b18d4ca2dded9e16c300719981c30 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 28 Jul 2020 14:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20insertOrUpdate=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java | 2 +-
 .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java   | 4 ++--
 .../java/com/epmet/service/impl/UserBaseInfoServiceImpl.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
index 96d90db4ef..c674685ee5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Data
 public class UserBaseInfoResultDTO implements Serializable {
     private static final long serialVersionUID = 3124057264557384333L;
-    @JsonIgnore
+
     private String id;
 
     /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index 70116e6e91..b70d1fcf07 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -24,8 +24,8 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
 public interface EpmetUserOpenFeignClient {
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index c2ba3d143b..f441b7d229 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -221,7 +221,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         if(StringUtils.isNotBlank(baseInfo.getSurname())) {
             baseInfo.setRealName(new StringBuilder(baseInfo.getSurname()).append(baseInfo.getName()).toString());
         }
-        if(null == userBaseInfoResultDTO || StringUtils.isBlank(userBaseInfoResultDTO.getId())){
+        if(null != userBaseInfoResultDTO && StringUtils.isNotBlank(userBaseInfoResultDTO.getId())){
             //更新
             baseInfo.setId(userBaseInfoResultDTO.getId());
             updateById(baseInfo);