diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index e11006dcaa..aa7bc28867 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -47,8 +47,8 @@ public enum EpmetErrorCode { IDCARDNO_ALREADY_EXITS(8109,"系统已存在相同身份证号码，请重新输入"), IDCARDNO_ERROR(8110,"身份证号格式错误，请重新输入"), CANNOT_DELETE_PARTY_MEMBER(8111,"该用户已注册党员，不允许删除"), - - + GROUP_LEADER_CAN_EDIT_GROUP_INFO(8112,"只有组长才可以修改小组信息"), + INVITE_NEW_MEMBER(8113,"只有讨论中的小组才可以邀请新成员"), CANNOT_AUDIT_WARM(8201, "请完善居民信息"), NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"), NOT_DEL_AGENCY_PER(8205, "该机关存在工作人员，不允许删除"), diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java index 4aebbce0d3..9e54c59eb5 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.group.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -63,4 +64,17 @@ public class GroupSummarizeResultDTO implements Serializable { * 当前用户对应的群主标识leader,member成员 */ private String leaderFlag; + + public GroupSummarizeResultDTO(){ + this.setGroupId(""); + this.setGroupHeadPhoto(""); + this.setLeaderName(""); + this.setGroupName(""); + this.setGroupIntroduction(""); + this.setTotalMember(NumConstant.ZERO); + this.setTotalPartyMember(NumConstant.ZERO); + this.setTotalApplyingMember(NumConstant.ZERO); + this.setTotalTopics(NumConstant.ZERO); + this.setLeaderFlag(""); + } } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java index cae84ce67b..c7a68f7b0b 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.invitation.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -58,4 +59,16 @@ public class LinkGroupInfoDTO implements Serializable { * 党员总数 */ private Integer totalPartyMember; + + public LinkGroupInfoDTO(){ + this.setGridId(""); + this.setGroupId(""); + this.setCustomerId(""); + this.setGroupHeadPhoto(""); + this.setLeaderName(""); + this.setGroupName(""); + this.setGroupIntroduction(""); + this.setTotalMember(NumConstant.ZERO); + this.setTotalPartyMember(NumConstant.ZERO); + } } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java index fbbc9214ff..4e3fd08cd5 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.group.dto.invitation.result; +import com.epmet.commons.tools.constant.Constant; import lombok.Data; import java.io.Serializable; @@ -23,4 +24,7 @@ public class LinkGroupInfoResultDTO implements Serializable { */ private LinkGroupInfoDTO groupInfo; + public LinkGroupInfoResultDTO(){ + this.setInGroup(Constant.NO); + } } diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index e8f81670f4..3158252c9a 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.58 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.59 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index ca1ef02f6c..8d4035f014 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.58 + 0.3.59 com.epmet resi-group diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index dd386b6ebb..0305525575 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -185,6 +185,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl myGroupList = baseDao.selectListMyGroup(myGroupFormDTO); + if (null == myGroupList || myGroupList.size() < 1) { + logger.info(String.format("我的小组查询为空,selectListMyGroup入参%s", JSON.toJSONString(myGroupFormDTO))); + return new ArrayList<>(); + } return myGroupList; } @@ -201,6 +205,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl recommendGroupList = baseDao.selectListRecommendGroup(recommendGroupFormDTO); + if (null == recommendGroupList || recommendGroupList.size() == 0) { + logger.info(String.format("推荐小组查询为空,selectListRecommendGroup入参%s", JSON.toJSONString(recommendGroupFormDTO))); + return new ArrayList<>(); + } for (RecommendGroupResultDTO recommendGroupResultDTO : recommendGroupList) { GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.selectLatestRecord(recommendGroupResultDTO.getGroupId(), recommendGroupFormDTO.getUserId()); @@ -223,6 +231,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl createdResultDTOList = baseDao.selectListMyCreated(createdFormDTO); + if (null == createdResultDTOList || createdResultDTOList.size() == 0) { + logger.info(String.format("我创建的小组查询为空,selectListMyCreated入参%s", JSON.toJSONString(createdFormDTO))); + return new ArrayList<>(); + } return createdResultDTOList; } @@ -239,8 +251,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { - logger.error("加入小组界面初始化，居民注册信息查询失败"); + logger.error(String.format("加入小组界面初始化查询成功,当前用户非注册居民,epmet-user-server接口入参%s,返回%s",JSON.toJSONString(resiUserInfoFormDTO),JSON.toJSONString(result))); throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode()); } } @@ -466,7 +481,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupInfo.getGroupId()); - if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { - groupInfo.setLeaderName(groupLeaderUserInfo.getData().getShowName()); - } else { - logger.error(String.format("居民端用户【%s】根据链接【%s】查看群邀请信息调用%s服务,获取组长信息异常,错误码:%s,错误提示:%s",formDTO.getUserId(),formDTO.getInvitationId(), ServiceConstant.EPMET_USER_SERVER,groupLeaderUserInfo.getCode(), groupLeaderUserInfo.getMsg())); + if(null!=groupInfo){ + linkGroupInfoResultDTO.setGroupInfo(groupInfo); + //3、获取组长信息 + Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupInfo.getGroupId()); + if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { + groupInfo.setLeaderName(groupLeaderUserInfo.getData().getShowName()); + } else { + logger.error(String.format("居民端用户【%s】根据链接【%s】查看群邀请信息调用epmet-user-server服务,获取组长信息异常,返参%s", + formDTO.getUserId(), + formDTO.getInvitationId(), + JSON.toJSONString(groupLeaderUserInfo))); + groupInfo.setLeaderName(""); + } + }else{ + logger.error(String.format("根据群邀请连接查询群基本信息异常,groupInfo is null,selectLinkGroupInfo入参groupId=%s",groupInvitationDTO.getResiGroupId())); + linkGroupInfoResultDTO.setGroupInfo(new LinkGroupInfoDTO()); } - linkGroupInfoResultDTO.setGroupInfo(groupInfo); //4、记录用户邀请关系 this.saveUserInvitation(groupInvitationDTO,formDTO); return linkGroupInfoResultDTO; @@ -260,10 +269,12 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl(); } ResiGroupMemberDTO groupMemberDTO = resiGroupDao.selectGroupLeader(groupId); if (null == groupMemberDTO) { + logger.error("查询小组组长信息为空,groupId=%s",groupId); return new Result<>(); } UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO(); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index fa9b5034c0..803ea51d94 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -218,11 +218,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl list = baseDao.selectListGroupMember(groupMemberListFormDTO); - if (null != list && list.size() > 0) { - List userIdList=new ArrayList<>(); - for (GroupMemberListResultDTO groupMemberListResultDTO : list) { - userIdList.add(groupMemberListResultDTO.getUserId()); - } - UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); - formDTO.setUserIdList(userIdList); - Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); - if(userResiInfoDTOListResult.success()){ - for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ - for (GroupMemberListResultDTO groupMember : list) { - if(groupMember.getUserId().equals(userResiInfo.getUserId())){ - groupMember.setUserShowName(userResiInfo.getShowName()); - groupMember.setHeadPhoto(userResiInfo.getHeadPhoto()); - break; - } + if (null == list || list.size() == 0) { + logger.error(String.format("群成员列表查询列表为空,selectListGroupMember入参%s",JSON.toJSONString(groupMemberListFormDTO))); + return new ArrayList<>(); + } + List userIdList=new ArrayList<>(); + for (GroupMemberListResultDTO groupMemberListResultDTO : list) { + userIdList.add(groupMemberListResultDTO.getUserId()); + } + UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + if(userResiInfoDTOListResult.success()){ + for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ + for (GroupMemberListResultDTO groupMember : list) { + if(groupMember.getUserId().equals(userResiInfo.getUserId())){ + groupMember.setUserShowName(userResiInfo.getShowName()); + groupMember.setHeadPhoto(userResiInfo.getHeadPhoto()); + break; } } - }else{ - logger.error(String.format("居民端用户【%s】查看群成员列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s", groupMemberListFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg())); } + }else{ + logger.warn(String.format("居民端用户【%s】查看群成员列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s", + groupMemberListFormDTO.getUserId(), + ServiceConstant.EPMET_USER_SERVER, + userResiInfoDTOListResult.getCode(), + userResiInfoDTOListResult.getMsg())); } return list; } @@ -324,28 +330,29 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl list = baseDao.selectListApplyingMember(applyingMemberFormDTO); - if (null != list && list.size() > 0) { - List userIdList=new ArrayList<>(); - for (ApplyingMemberResultDTO applyingMemberResultDTO : list) { - userIdList.add(applyingMemberResultDTO.getApplyUserId()); - } - UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); - formDTO.setUserIdList(userIdList); - Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); - if(userResiInfoDTOListResult.success()){ - for (ApplyingMemberResultDTO memberInfo : list) { - for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ - if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){ - memberInfo.setApplyUserName(userResiInfo.getShowName()); - memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto()); - break; - } + if (null == list || list.size() == 0) { + logger.info(String.format("查看入群待审核列表返回为空,selectListApplyingMember入参%s",JSON.toJSONString(applyingMemberFormDTO))); + return new ArrayList<>(); + } + List userIdList=new ArrayList<>(); + for (ApplyingMemberResultDTO applyingMemberResultDTO : list) { + userIdList.add(applyingMemberResultDTO.getApplyUserId()); + } + UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); + formDTO.setUserIdList(userIdList); + Result> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); + if(userResiInfoDTOListResult.success()){ + for (ApplyingMemberResultDTO memberInfo : list) { + for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ + if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){ + memberInfo.setApplyUserName(userResiInfo.getShowName()); + memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto()); + break; } } - }else{ - logger.error(String.format("居民端组长【%s】查看入群待审核列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s",applyingMemberFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg())); } - + }else{ + logger.warn(String.format("居民端组长【%s】查看入群待审核列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s",applyingMemberFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg())); } return list; } @@ -363,13 +370,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl 4.0.0 - 0.3.26 + 0.3.27 com.epmet resi-mine diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index 61f9e675b3..10d9b898f5 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -1,8 +1,8 @@ package com.epmet.modules.grid.service.impl; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -43,20 +43,22 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { **/ @Override public LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto) { + LatestGridInfoResultDTO latestGridInfoResultDTO=new LatestGridInfoResultDTO(); if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) { - logger.error(String.format("居民端【%s】获取用户最近访问的网格失败:错误提示:%s",tokenDto.getUserId(),ModuleConstant.USER_NOT_NULL)); + logger.warn(String.format("居民端获取用户最近访问的网格失败:tokenDto is null or userId is null")); throw new RenException(ModuleConstant.USER_NOT_NULL); } if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){ - logger.error(String.format("居民端【%s】获取用户最近访问的网格失败,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL)); + logger.warn(String.format("居民端获取用户最近访问的网格失败,userId:%s,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL)); throw new RenException(ModuleConstant.FOR_RESI_CALL); } + logger.info(String.format("居民端获取用户最近访问网格入参%s", JSON.toJSONString(tokenDto))); Result userResult=epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId()); if(userResult.success()&&null!=userResult.getData()){ return userResult.getData(); } - logger.error(String.format("居民端用户【%s】获取用户最近访问网格失败,调用%s服务入参userId:%s,错误码:%s,错误提示:%s", tokenDto.getUserId(),ServiceConstant.EPMET_USER_SERVER,tokenDto.getUserId(),userResult.getCode(),userResult.getMsg())); - return null; + logger.warn(String.format("居民端获取用户最近访问网格失败,调用epmet-user-server服务返回%s",JSON.toJSONString(userResult))); + return latestGridInfoResultDTO; } /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java index 829a1cd2d5..9daa47e68f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java @@ -22,4 +22,10 @@ public class LatestGridInfoResultDTO implements Serializable { * 用户最后一次访问的网格 */ private String gridId; + + public LatestGridInfoResultDTO(){ + this.setCustomerId(""); + this.setGridId(""); + } + } diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 697c8484ae..f34d70bd71 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.73 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.74 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 7a5fa0c7cf..21468e2d5f 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.73 + 0.3.74 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index a14a1b002c..304924b3dc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -22,11 +22,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constant.GridVisitedConstant; import com.epmet.dao.GridLatestDao; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.GridLatestDTO; @@ -149,13 +147,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl getLatestGridInfoByUserId(String userId) { - if(StringUtils.isBlank(userId)){ - logger.error(GridVisitedConstant.USER_ID_NOTNULL); - throw new RenException(GridVisitedConstant.USER_ID_NOTNULL); - } - LatestGridInfoResultDTO latestGridInfoResultDTO = baseDao.selectLatestGridInfoByUserId(userId); + LatestGridInfoResultDTO latestGridInfoResultDTO= baseDao.selectLatestGridInfoByUserId(userId); if (null == latestGridInfoResultDTO) { - return new Result<>(); + return new Result().ok(new LatestGridInfoResultDTO()); } return new Result().ok(latestGridInfoResultDTO); }