微调

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -21,6 +21,7 @@ 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.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -226,7 +227,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
         formDTO.setPageNo(pageIndex);
         List<EvaluationListResultDTO> data = issueSatisfactionDetailDao.evaluationList(formDTO);
-        if (data.size() == NumConstant.ZERO || data == null) {
+        if (data == null || data.size() == NumConstant.ZERO ) {
             return new ArrayList<>();
         }
         //获取头像和昵称   eg:山东路168号-周先生
@@ -237,14 +238,13 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) {
             throw new RenException(IssueConstant.SELECT_USERINFO_EXCEPTION);
         }
-        List<EvaluationListResultDTO> resultList = data.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
+        return data.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user ->
                 evaluation.getUserId().equals(user.getUserId())).map(userInfo -> {
             EvaluationListResultDTO resultDTO = ConvertUtils.sourceToTarget(evaluation, EvaluationListResultDTO.class);
-            resultDTO.setUserNickName(null == userInfo.getShowName() ? "" : userInfo.getShowName());
+            resultDTO.setUserNickName(null == userInfo.getShowName() ? StrConstant.EPMETY_STR : userInfo.getShowName());
-            resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? "" : userInfo.getHeadPhoto());
+            resultDTO.setUserHeadPhoto(null == userInfo.getHeadPhoto() ? StrConstant.EPMETY_STR : userInfo.getHeadPhoto());
             return resultDTO;
         })).collect(Collectors.toList());
-        return resultList;
     }
 
     /**
@@ -283,7 +283,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         List<IssueVoteStatisticalDTO> statisticalList =
                 baseDao.selectListByIds(ids);
         if (null != statisticalList && statisticalList.size() > NumConstant.ZERO) {
-            List<String> statisiticalIds = statisticalList.stream().map(vote -> vote.getIssueId()).collect(Collectors.toList());
+            List<String> statisiticalIds = statisticalList.stream().map(IssueVoteStatisticalDTO::getIssueId).collect(Collectors.toList());
 
             if (ids.size() > statisiticalIds.size()) {
                 //差集