diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index f633f3438a..7b62da6e95 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1699,7 +1699,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         Result<List<AllGridsByUserIdResultDTO>> gridsResult = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
         if (gridsResult.success()) {
             List<AllGridsByUserIdResultDTO> grids = gridsResult.getData();
-            grids.stream().forEach(g -> gridIdAndNames.put(g.getGridId(), g.getGridName()));
+            if (grids != null && grids.size() != 0) {
+                grids.stream().forEach(g -> gridIdAndNames.put(g.getGridId(), g.getGridName()));
+            }
         } else {
             log.error("【我创建的话题列表】，查询组织-网格名称出错，没有抛出，内部处理。内部消息:{},外部消息:{}", gridsResult.getInternalMsg(), gridsResult.getMsg());
         }
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java
index f89028a9dd..75c60668c6 100644
--- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java
@@ -36,4 +36,8 @@ public class InitInfoResultDTO implements Serializable {
 	 * 详细地址
 	 */
 	private String buildingAddress;
+	/**
+	 * 昵称
+	 */
+	private String nickname;
 }
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
index f758bf53b4..d3cf8a2a64 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java
@@ -39,6 +39,7 @@ public class PersonalCenterServiceImpl implements PersonalCenterService {
 		resultDTO.setStreet(baseInfoResult.getData().getStreet());
 		resultDTO.setDistrict(baseInfoResult.getData().getDistrict());
 		resultDTO.setBuildingAddress(baseInfoResult.getData().getBuildingAddress());
+		resultDTO.setNickname(baseInfoResult.getData().getNickname());
 		return resultDTO;
 	}
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java
index d6d9655b88..81bd8e9082 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java
@@ -49,4 +49,9 @@ public class EditInfoFormDTO implements Serializable {
 	 * 详细地址
 	 */
 	private String buildingAddress;
+	/**
+	 * 昵称
+	 */
+	@NotBlank(message = "昵称不能为空")
+	private String nickname;
 }