From e2ca2231a2d9b97fa4d59662e3eff74bb1a2fa64 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 25 May 2020 19:01:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=A4=B4=E5=83=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=88=91=E7=9A=84=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9B=A0=E4=B8=BA=E9=99=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=BA=E8=BF=9B=E5=85=A5=E7=BD=91=E6=A0=BC=E5=90=8E=E4=B8=8D?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91=EF=BC=8Cregister=5Frelatio?= =?UTF-8?q?n=E8=A1=A8=E4=B8=AD=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=AD=A4?= =?UTF-8?q?=E6=9D=A1=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserServiceImpl.java | 8 +++++--- .../main/java/com/epmet/util/ModuleConstant.java | 13 +++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index c23afa09a6..43fec48b74 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -16,15 +16,16 @@ import com.epmet.entity.UserEntity; import com.epmet.entity.UserWechatEntity; import com.epmet.feign.GovOrgFeignClient; import com.epmet.service.UserService; +import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; + import java.util.Date; -import java.util.List; + /** @@ -153,12 +154,13 @@ public class UserServiceImpl extends BaseServiceImpl implem if(StringUtils.isNotBlank(myselfMsg.getGridId())){ //registerGridName 首次注册的网格 CustomerGridFormDTO gridId = new CustomerGridFormDTO(); - gridId.setGridId(myselfMsg.getGridId()); + gridId.setGridId(myResiUserInfoFormDTO.getGridId()); Result gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId); if(gridResult.success() && null != gridResult.getData()){ result.setRegisterGridName(gridResult.getData().getGridName()); }else{ if(StringUtils.isNotBlank(gridResult.getMsg())) log.warn(gridResult.getMsg()); + result.setRegisterGridName(ModuleConstant.EMPTY_STR); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java new file mode 100644 index 0000000000..4887b0a2f2 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java @@ -0,0 +1,13 @@ +package com.epmet.util; + +/** + * 常量类 + * */ +public interface ModuleConstant { + + /** + * 空字符串 + * */ + String EMPTY_STR = ""; + +}