Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0

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());
 	}

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);
     }
 }