From a9f93217c42e83541b7b505c0a9bfe71c52bc394 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Wed, 25 Mar 2020 11:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?bug=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/CustomerUserServiceImpl.java     | 4 ++--
 .../java/com/epmet/service/impl/GridLatestServiceImpl.java  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
index c9ffb85093..8bd9024bd1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
@@ -139,9 +139,9 @@ public class CustomerUserServiceImpl extends BaseServiceImpl<CustomerUserDao, Cu
 	public Result<String> saveOrUpdateCustomerUser(CustomerUserDTO customerUserDTO) {
 		CustomerUserEntity entity = ConvertUtils.sourceToTarget(customerUserDTO, CustomerUserEntity.class);
 		if (StringUtils.isNotBlank(customerUserDTO.getId())) {
-			insert(entity);
-		} else {
 			updateById(entity);
+		} else {
+			insert(entity);
 		}
 		return new Result<String>().ok(entity.getId());
 	}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index b427ea8e2d..b060b4940c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -147,6 +147,10 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         if(StringUtils.isBlank(userId)){
             return new Result<LatestGridInfoResultDTO>().error(GridVisitedConstant.USER_ID_NOTNULL);
         }
-        return new Result<LatestGridInfoResultDTO>().ok(baseDao.selectLatestGridInfoByUserId(userId));
+        LatestGridInfoResultDTO latestGridInfoResultDTO = baseDao.selectLatestGridInfoByUserId(userId);
+        if (null == latestGridInfoResultDTO) {
+            return new Result<>();
+        }
+        return new Result<LatestGridInfoResultDTO>().ok(latestGridInfoResultDTO);
     }
 }