From d402ef92b6afef54a13d29a17d6424697ae774a2 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 18 Jun 2020 09:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8A=A0override?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/StatsDemoServiceImpl.java     | 1 +
 .../com/epmet/service/impl/RegisterRelationServiceImpl.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java
index 343c0bed94..b29ca1c98a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDemoServiceImpl.java
@@ -69,6 +69,7 @@ public class StatsDemoServiceImpl implements StatsDemoService {
         }
     }
 
+    @Override
     public List<AgencySubTreeDto> getAllAgency(){
         return demoGovOrgService.getAllAgency();
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index 279232667f..b2cba9216e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -216,11 +216,11 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
 
                     baseDao.insert(registerRelationToSave);
                 }else{
-                    //不存在相同客户不同网格的注册记录
+                    //不存在相同客户不同网格的注册记录(既在这个客户下没有过register_relation记录，没有进过这个客户的网格，这是第一次进入这个客户下的网格)
                     Optional<RegisterRelationEntity> registerRecordWithDiffCustAndGrid =
                             registerRecords.stream().filter(obj -> !customerId.equals(obj.getCustomerId()) && !gridId.equals(obj.getGridId())).findAny();
                     if(registerRecordWithDiffCustAndGrid.isPresent()){
-                        //如果存在不同客户不同网格的注册信息
+                        //如果存在不同客户不同网格的注册信息(当前用户已经在别的客户下的网格注册过)
                         //注册用户 参与用户
                         registerRelationToSave.setFirstRegister(NumConstant.ZERO_STR);
                         registerRelationToSave.setRegister(NumConstant.ONE_STR);