Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/impl/RegionalEnterprisesServiceImpl.java

@@ -31,7 +31,7 @@ public class RegionalEnterprisesServiceImpl implements RegionalEnterprisesServic
 
     @Override
     public AjaxResult enterprisePage(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(object, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/regional/page",BeanUtil.beanToMap(object, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
         if (code.equals(HttpStatus.OK.value())) {
             Map data = MapUtils.getMap(map, "data", null);

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

@@ -140,7 +140,11 @@ public class BusinessOpportunityRadarService {
             vo.setId(i + 1);
             vo.setBuildingProjectType(MapUtil.getStr(list.get(i),"buildingProjectType"));
             if (null!=list.get(i).get("projectName")){
-                vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
+                if (null!=list.get(i).get("project_level")){
+                    vo.setProjectName(MapUtil.getStr(list.get(i),"project_level").concat("-")+StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
+                }else {
+                    vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
+                }
             }
             if (null!=list.get(i).get("chargeDepartment")){
                 vo.setChargeDepartment(StringUtils.removeRed(MapUtil.getStr(list.get(i),"chargeDepartment")));