Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

                                                                                                      # Conflicts:
                                                                                                      #	dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java
项目名称联想查询

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -148,7 +148,9 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                         BusinessLikeProjectNameListVo vo = new BusinessLikeProjectNameListVo();
                         vo.setProjectName(StringUtils.markInRed(MapUtil.getStr(map, "projectName"), dto.getProjectName()));
                         vo.setCompanyName(MapUtil.getStr(map, "tenderee"));
-                        vo.setInvestmentAmount(Double.parseDouble(MapUtil.getStr(map, "projectContractAmount")));
+                        if (null!=map.get("projectContractAmount")&&ObjectUtil.isNotEmpty(map.get("projectContractAmount"))){
+                            vo.setInvestmentAmount(MapUtil.getDouble(map, "projectContractAmount"));
+                        }
                         vo.setProjectType(MapUtil.getStr(map, "projectType"));
                         vo.setProjectCategory(MapUtil.getStr(map, "projectPurposes"));
                         vos.add(vo);
@@ -156,7 +158,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                 }
             }
         } catch (Exception e) {
-            log.error("模糊查询项目名称调用失败！");
+            log.error("模糊查询项目名称调用失败！",e);
         }
 
         return vos;