Merge remote-tracking branch 'origin/dev'

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/PartyBranchManageServiceImpl.java

@@ -137,17 +137,14 @@ public class PartyBranchManageServiceImpl implements PartyBranchManageService {
         CustomerPartyBranchDTO customerPartyBranch = customerPartyBranchResult.getData();
         PartyMemberBaseInfoAddFormDTO partyMemberBaseInfoAddFormDTO = this.getPartyMemberBaseInfoAddFormDTO(formDTO, customerPartyBranch);
         Result<String> result = resiPartyMemberOpenFeignClient.addPartyMemberBaseInfo(partyMemberBaseInfoAddFormDTO);
+        if (!result.success() || StringUtils.isBlank(result.getData())) {
+            throw new RenException(result.getCode(), result.getMsg());
+        }
         //3、党支部总人数+1
-        if (result.success() && StringUtils.isNotBlank(result.getData())) {
+        customerPartyBranch.setTotalPartyMember(customerPartyBranch.getTotalPartyMember() + 1);
-            //党支部总人数+1
+        Result<String> updatePartyBranchResult = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranch);
-            customerPartyBranch.setTotalPartyMember(customerPartyBranch.getTotalPartyMember() + 1);
+        if (updatePartyBranchResult.success()) {
-            Result<String> updatePartyBranchResult = govOrgOpenFeignClient.updatePartyBranch(customerPartyBranch);
+            logger.info(String.format("党支部(%s)总人数+1", formDTO.getPartyBranchId()));
-            if (updatePartyBranchResult.success()) {
-                logger.info(String.format("党支部(%s)总人数+1", formDTO.getPartyBranchId()));
-            }
-        } else {
-            logger.error("添加党员异常");
-            throw new RenException(result.getCode());
         }
         return result.getData();
     }