Merge branch 'bugfix/party_manage'

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java

@@ -566,6 +566,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
                 } finally {
                     IOUtils.closeQuietly(os);
                     try {
+                        assert fileItem != null;
                         fileItem.delete();
                     } catch (Exception e){
                         log.error("【党员信息导入】删除临时描述文件失败:{}", ExceptionUtils.getErrorStackTrace(e));
@@ -699,9 +700,10 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
 
         //同步ic_resi_user表对应的数据,并获取志愿者类型
         Result<IcPartyMemberDTO> result =  epmetUserOpenFeignClient.icPartyMemberSync(ConvertUtils.sourceToTarget(e, IcPartyMemberDTO.class));
-        if (!result.success() && null != result.getData()) {
+        if (result.success() && null != result.getData()) {
             e.setIcResiUser(result.getData().getIcResiUser());
             e.setVolunteerCategory(result.getData().getVolunteerCategory());
+            e.setAddress(result.getData().getAddress());
         }
         e.setCreatedBy(currentUserId);
         e.setUpdatedBy(currentUserId);

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -61,10 +61,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.entity.*;
 import com.epmet.excel.support.ExportResiUserItemDTO;
-import com.epmet.feign.EpmetAdminOpenFeignClient;
-import com.epmet.feign.EpmetHeartOpenFeignClient;
-import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.feign.*;
 import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
 import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO;
@@ -90,7 +86,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-
 import java.sql.Timestamp;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
@@ -2294,7 +2289,26 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             if (null == user) {
                 return dto;
             }
+
             dto.setIcResiUser(user.getId());
+            //查询网格信息
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(user.getGridId());
+            //查询房屋信息
+            HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), user.getHomeId());
+            if (null != gridInfo && null != houseInfo) {
+                String address;
+                if (StringUtils.isNotBlank(gridInfo.getAllParentName())) {
+                    address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                } else {
+                    address = gridInfo.getGridNamePath()
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName())
+                            .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
+                }
+                dto.setAddress(address);
+            }
+
             formDTO.setIcResiUser(user.getId());
             //更新居民信息并将是否是党员字段设为1
             user.setName(formDTO.getName());