diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentMiniFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentMiniFormDTO.java index 30afc1b872..cfaf9da56a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentMiniFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentMiniFormDTO.java @@ -53,10 +53,12 @@ public class AppointmentMiniFormDTO implements Serializable { /** * 组织ID */ + @NotBlank(message = "orgId不能为空",groups = AppointmentMiniForm.class) private String orgId; /** * 组织类型,grid:网格,agency:组织 */ + @NotBlank(message = "orgType不能为空",groups = AppointmentMiniForm.class) private String orgType; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java index a2f543d0c3..d4dc851982 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java @@ -348,19 +348,10 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl registerRelation = userOpenFeignClient.resiRelationInfo(tokenDto.getUserId()); - if (!registerRelation.success()){ - throw new EpmetException(String.format("查询居民{%s}信息失败",tokenDto.getUserId())); - } IcMatterAppointmentRecordEntity e = ConvertUtils.sourceToTarget(formDTO, IcMatterAppointmentRecordEntity.class); e.setCustomerId(customerId); - if (StringUtils.isNotBlank(formDTO.getOrgId())){ - e.setOrgId(formDTO.getOrgId()); - e.setOrgType(formDTO.getOrgType()); - }else { - e.setOrgId(registerRelation.getData().getGridId()); - e.setOrgType(PartyServiceCenterConstant.ORG_TYPE_GRID); - } + e.setOrgId(formDTO.getOrgId()); + e.setOrgType(formDTO.getOrgType()); if (e.getOrgType().equals(PartyServiceCenterConstant.ORG_TYPE_GRID)){ GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(e.getOrgId()); if (null == gridInfo){