From 12140dc6b4cecc5e3dc61289187cbbe9c50bbc52 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 10 Feb 2022 14:51:50 +0800
Subject: [PATCH] 注释不需要代码
---
screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
index 08c0b29..2b5a1d4 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
@@ -74,8 +74,8 @@
if (ObjectUtils.isEmpty(organization)){
continue;
}
- resultMap = JSON.parseObject(JSON.toJSONString(organization), Map.class);
- //resultMap.put("organization",organization);
+ resultMap.put("id",organization.getId());
+ resultMap.put("name",organization.getName());
QueryWrapper<ServicesScope> servicesScopeQueryWrapper = new QueryWrapper<>();
servicesScopeQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
servicesScopeQueryWrapper.eq("organization_id",organizationId);
@@ -87,7 +87,17 @@
if (servicesScopes.size()<1){
continue;
}
- resultMap.put("servicesScopes",servicesScopes);
+ List<Map<String,Object>> servicesScopeList= new ArrayList<>();
+ for (ServicesScope servicesScope:servicesScopes) {
+ Map<String,Object> servicesScopeMap = new HashMap<>();
+ servicesScopeMap.put("id",servicesScope.getId());
+ servicesScopeMap.put("name",servicesScope.getName());
+ servicesScopeMap.put("organizationId",servicesScope.getOrganizationId());
+ servicesScopeMap.put("centerLongitude",servicesScope.getCenterLongitude());
+ servicesScopeMap.put("centerLatitude",servicesScope.getCenterLatitude());
+ servicesScopeList.add(servicesScopeMap);
+ }
+ resultMap.put("servicesScopes",servicesScopeList);
resultList.add(resultMap);
}
if (resultList.size()<1){
@@ -96,7 +106,7 @@
return resultList;
}
- private OrganizationServicesScopeVO treeStructure(int orgId){
+ /*private OrganizationServicesScopeVO treeStructure(int orgId){
OrganizationServicesScopeVO organizationServicesScopeVO = new OrganizationServicesScopeVO();
Organization organization = organizationMapper.selectById(orgId);
organizationServicesScopeVO.setOrganization(organization);
@@ -117,5 +127,5 @@
}
//servicesScopeMapper.selectList()
return null;
- }
+ }*/
}
--
Gitblit v1.8.0