Merge remote-tracking branch 'origin/dev_zxc_bug' into dev_temp

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java

@@ -112,4 +112,6 @@ public interface IssueConstant {
      * 审核状态:驳回
      */
     String REJECTED="rejected";
+
+    String PROJECT_PROCESS_LIST_FAILURE = "查询项目进展失败......";
 }

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

@@ -20,9 +20,11 @@ package com.epmet.service.impl;
 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.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IssueConstant;
 import com.epmet.dao.IssueProcessDao;
 import com.epmet.dao.IssueProjectRelationDao;
@@ -39,6 +41,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -137,17 +140,27 @@ public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, Is
         List<ProcessListResultDTO> listResult = new ArrayList<ProcessListResultDTO>();
         IssueDTO issueDTO = issueService.get(issueId.getIssueId());
         String issueStatus = issueDTO.getIssueStatus();
-        if (issueStatus.equals(IssueConstant.ISSUE_CLOSED)){//已关闭——处理进展
+        if (issueStatus.equals(IssueConstant.ISSUE_CLOSED)){
+            //已关闭——处理进展
             listResult = baseDao.issueProcess(issueId);
-        }else if (issueStatus.equals(IssueConstant.ISSUE_SHIFT_PROJECT)){//已转项目——处理进展
+        }else if (issueStatus.equals(IssueConstant.ISSUE_SHIFT_PROJECT)){
+            //已转项目——处理进展
             String projectId = issueProjectRelationDao.selectProjectIdByIssueId(issueId.getIssueId());
             if (!StringUtils.isBlank(projectId)) {
                 ProcessProjectIdFormDTO formDTO = new ProcessProjectIdFormDTO();
                 formDTO.setProjectId(projectId);
-                listResult = govProjectFeignClient.projectProcessList(formDTO).getData();
+                Result<List<ProcessListResultDTO>> resultDTO = govProjectFeignClient.projectProcessList(formDTO);
+                if (!resultDTO.success()){
+                    throw new RenException(IssueConstant.PROJECT_PROCESS_LIST_FAILURE);
+                }
+                if (!CollectionUtils.isEmpty(resultDTO.getData())){
+                    listResult = resultDTO.getData();
+                }
                 //转议题信息
                 ProcessListResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId);
-                listResult.add(issueProcessResultDTO);
+                if (null != issueProcessResultDTO) {
+                    listResult.add(issueProcessResultDTO);
+                }
             }
         }else {
             return new ArrayList<>();