From d1f07939c0ce5fc8cf860a571842757e83e4fdd7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 18 Jun 2020 20:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86=EF=BC=9A?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=85=9A=E5=91=98=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/PartyBranchInfoResultDTO.java   |  7 +++++++
 .../dto/result/PartyMemberInfoDetailResultDTO.java   | 12 ++++++++++++
 .../service/impl/PartyBranchManageServiceImpl.java   |  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java
index dad717fc22..df3b4bc492 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyBranchInfoResultDTO.java
@@ -38,4 +38,11 @@ public class PartyBranchInfoResultDTO implements Serializable {
      * 党支部所属网格id
      */
     private String gridId;
+
+    public PartyBranchInfoResultDTO(){
+        this.partyBranchId="";
+        this.partyBranchName="";
+        this.profile="";
+        this.gridName="";
+    }
 }
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
index a125784788..e86f90e7e4 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/PartyMemberInfoDetailResultDTO.java
@@ -57,4 +57,16 @@ public class PartyMemberInfoDetailResultDTO implements Serializable {
      * 党支部id
      */
     private String partyBranchId;
+
+    public PartyMemberInfoDetailResultDTO(){
+        this.partyBranchId="";
+        this.name="";
+        this.idCard="";
+        this.mobile="";
+        this.gender="";
+        this.status=Boolean.FALSE;
+        this.activeDesc="";
+        this.partyBranchName="";
+        this.partyBranchId="";
+    }
 }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
index d193449aa2..0cf320e03f 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java
@@ -181,11 +181,12 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService {
                 String gridName=partyBranchDTOResult.getData().getGridName();
                 String branchName=partyBranchDTOResult.getData().getPartyBranchName();
                 partyMemberInfoDetailResultDTO.setPartyBranchName(String.format("%s-%s-%s",agencyName,gridName,branchName));
+                return partyMemberInfoDetailResultDTO;
             }else{
                 logger.error("党员详情查询异常");
             }
         }
-        return null;
+        return partyMemberInfoDetailResultDTO ;
     }
 
     @Override