zhuan

purchase-system/src/main/java/com/ozs/base/service/impl/BaseExpertServiceImpl.java

@@ -101,20 +101,24 @@ public class BaseExpertServiceImpl extends ServiceImpl<BaseExpertMapper, BaseExp
         List<PmDemand> pmDemandList = pmDemandService.selectExtractionExpert(baseExpertVo);
         List<PmDemandResVo> pmDemandResponseVoList = changTo(pmDemandList);
         // 遍历项目 查询专家姓名
-        for (PmDemandResVo pmDemandResVo : pmDemandResponseVoList) {
-            Long demandId = pmDemandResVo.getDemandId();
-            // 查询项目专家关联表 专家ID，关联时间
-            List<PmDemandExpertRef> pmDemandExpertRefList = baseExpertMapper.getExpertIdList(demandId);
-            // 专家ID列表
-            List<Long> expertList= pmDemandExpertRefList.stream().map(PmDemandExpertRef::getExpertId).collect(Collectors.toList());
-            // 获取抽取时间（列表中取其中一个时间）
-            Date accessTime = pmDemandExpertRefList.get(0).getAccessTime();
-            Map<String, String> map = baseExpertMapper.getExpertNameList(expertList);
-            String expertNameStr = map.get("expertName");
-            String varietyPurchaseStr = map.get("varietyPurchase");
-            pmDemandResVo.setExpertNameStr(expertNameStr);
-            pmDemandResVo.setVarietyPurchaseStr(varietyPurchaseStr);
-            pmDemandResVo.setAccessTime(accessTime);
+        if (!ObjectUtils.isEmpty(pmDemandResponseVoList) && pmDemandResponseVoList.size() > 0) {
+            for (PmDemandResVo pmDemandResVo : pmDemandResponseVoList) {
+                Long demandId = pmDemandResVo.getDemandId();
+                // 查询项目专家关联表 专家ID，关联时间
+                List<PmDemandExpertRef> pmDemandExpertRefList = baseExpertMapper.getExpertIdList(demandId);
+                // 专家ID列表
+                List<Long> expertList = pmDemandExpertRefList.stream().map(PmDemandExpertRef::getExpertId).collect(Collectors.toList());
+                // 获取抽取时间（列表中取其中一个时间）
+                Date accessTime = pmDemandExpertRefList.get(0).getAccessTime();
+                Map<String, String> map = baseExpertMapper.getExpertNameList(expertList);
+                if (!ObjectUtils.isEmpty(map)) {
+                    String expertNameStr = map.get("expertName");
+                    String varietyPurchaseStr = map.get("varietyPurchase");
+                    pmDemandResVo.setExpertNameStr(expertNameStr);
+                    pmDemandResVo.setVarietyPurchaseStr(varietyPurchaseStr);
+                }
+                pmDemandResVo.setAccessTime(accessTime);
+            }
         }
         PageHelper.startPage(baseExpertVo.getPageNum().intValue(), baseExpertVo.getPageSize().intValue());
         PageInfo<PmDemandResVo> pageInfo = new PageInfo<>(pmDemandResponseVoList);