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