diff --git a/src/main/java/com/cm/systemcity/service/areapoints/impl/AreaPointsServiceImpl.java b/src/main/java/com/cm/systemcity/service/areapoints/impl/AreaPointsServiceImpl.java index 3db3f16..035ee7c 100755 --- a/src/main/java/com/cm/systemcity/service/areapoints/impl/AreaPointsServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/areapoints/impl/AreaPointsServiceImpl.java @@ -115,8 +115,8 @@ public class AreaPointsServiceImpl extends AbstractService implements IAreaPoint subAdministrativeEasyUITreeDTOS.add(createAreaTreeDTO("community", "社区", "icon-area")); administrativeEasyUITreeDTO.setChildren(subAdministrativeEasyUITreeDTOS); easyUITreeDTOS.add(administrativeEasyUITreeDTO); - // 片区 - EasyUITreeDTO areaEasyUITreeDTO = createAreaTreeDTO("area", "片区", "icon-area"); + // 网格 + EasyUITreeDTO areaEasyUITreeDTO = createAreaTreeDTO("area", "网格", "icon-area"); List subAreaEasyUITreeDTOS = new ArrayList<>(); EasyUITreeDTO level1Area = createAreaTreeDTO("areaLevel1", "二级网格长责任区域", "icon-area"); diff --git a/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java b/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java index 064e4c3..5ce3427 100755 --- a/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/communityboss/impl/CommunityBossServiceImpl.java @@ -59,6 +59,8 @@ public class CommunityBossServiceImpl extends AbstractService implements ICommun private ICityDistrictService cityDistrictService; @Autowired private ICityBuildingService cityBuildingService; + @Autowired + private ICommunityBossService communityBossService; private static final String CITY_DICT_ID = "9d179f05-3ea0-48f7-853c-d3b7124b791c"; @@ -349,7 +351,7 @@ public class CommunityBossServiceImpl extends AbstractService implements ICommun if (communityBossDTO != null) { for (int i = communityBossDTO.getCommunityBossLevel() - 1; i > 0; i--) { params.put("communityBossId", communityBossDTO.getCommunityBossParentId()); - communityBossDTO = getCommunityBossDTO(params); + communityBossDTO = communityBossService.getCommunityBoss(params); communityBossDTOs.add(0, communityBossDTO); } } diff --git a/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java b/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java index 3081a2f..7c2d81b 100755 --- a/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java @@ -640,10 +640,17 @@ public class UserLocationServiceImpl extends BaseService implements IUserLocatio @Override public JSONObject getUserDetail(Map params) throws SearchException, AccessTokenException { String userId = params.get("userId").toString(); - JSONObject userDetail = userService.getUserDetail(params); + /** + * 小王帅 2021年7月5日12:02:18 + */ + Map queryMap = new HashMap<>(4); + queryMap.put("communityBossId",userId); + CommunityBossDTO communityBoss = communityBossService.getCommunityBoss(queryMap); + queryMap.put("userId",communityBoss.getCommunityBossUserId()); + JSONObject userDetail = userService.getUserDetail(queryMap); LOG.debug("上级网格长"); params.clear(); - params.put("communityBossId", userId); + params.put("communityBossId", communityBoss.getCommunityBossId()); List listParentCommunityBoss = communityBossService.listParentCommunityBossByUserId(params); userDetail.put("parentCommunityBosses", listParentCommunityBoss); LOG.debug("所属街道和社区"); diff --git a/src/main/resources/static/default.html b/src/main/resources/static/default.html index c9ad323..47b84d4 100755 --- a/src/main/resources/static/default.html +++ b/src/main/resources/static/default.html @@ -26,7 +26,7 @@
- 社区数量 + 三级网格

0

@@ -41,7 +41,7 @@
- 分管领导 + 一级网格长

0

diff --git a/src/main/resources/static/route/assessment/list_day.html b/src/main/resources/static/route/assessment/list_day.html index 9bce10a..0118022 100755 --- a/src/main/resources/static/route/assessment/list_day.html +++ b/src/main/resources/static/route/assessment/list_day.html @@ -38,7 +38,7 @@