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 = ""; + +}