Merge branches 'dev' and 'dev_partybranch' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_partybranch

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="";
+    }
 }

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="";
+    }
 }

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