diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java
index 6c425c8d59..505f329900 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/UserMessageServiceImpl.java
@@ -28,6 +28,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserMessageConstans;
 import com.epmet.dao.UserMessageDao;
+import com.epmet.dto.CustomerDepartmentDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.MymessageFormDTO;
@@ -188,8 +189,18 @@ public class UserMessageServiceImpl extends BaseServiceImpl<UserMessageDao, User
 
 		if(ModuleConstant.INSTITUTION_GRID.equals(msgResi2GovFormDTO.getInstitutionFlag())){
 			//1.根据网格Id找到其PID，即当前的AgencyId，调用gov-org服务
-			Result<CustomerGridDTO> gridInfo = govOrgFeignClient.get(msgResi2GovFormDTO.getInstitutionId());
-			if(!gridInfo.success() || null == gridInfo.getData() || StringUtils.isBlank(gridInfo.getData().getPid())){
+			Result<CustomerGridDTO> gridInfo = govOrgFeignClient.getGrid(msgResi2GovFormDTO.getInstitutionId());
+			if(gridInfo.success() && null != gridInfo.getData() && StringUtils.isNotBlank(gridInfo.getData().getPid())){
+
+			}else{
+				logger.warn("");
+			}
+		}else if(ModuleConstant.INSTITUTION_DEPT.equals(msgResi2GovFormDTO.getInstitutionFlag())){
+			//1.根据部门Id找到其AGENCY_ID，调用gov-org服务
+			Result<CustomerDepartmentDTO> deptInfo = govOrgFeignClient.getDept(msgResi2GovFormDTO.getInstitutionId());
+			if(deptInfo.success() && null != deptInfo.getData() && StringUtils.isNoneBlank(deptInfo.getData().getAgencyId())){
+
+			}else{
 				logger.warn("");
 			}
 		}