Browse Source

Merge branch 'dev_party_auth_up_syc'

dev
zhaoqifeng 3 years ago
parent
commit
28d8802a65
  1. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
  2. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@ -215,6 +215,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
// 说明数据库已存在此楼栋,不需添加 // 说明数据库已存在此楼栋,不需添加
nums.add(num); nums.add(num);
disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID); disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID);
return;
} }
if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){
List<String> gridIds = new ArrayList<>(); List<String> gridIds = new ArrayList<>();

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@ -494,6 +494,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
// 说明数据库已存在此楼栋,不需添加 // 说明数据库已存在此楼栋,不需添加
nums.add(num); nums.add(num);
disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID); disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID);
return;
} }
if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){
List<String> gridIds = new ArrayList<>(); List<String> gridIds = new ArrayList<>();

Loading…
Cancel
Save