From 503135f1f8a7cfed29cac1786a6a7c8758eed8d3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 16 七月 2021 10:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
index c6376b6..dd73f50 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -8,6 +8,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
+import com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO;
+import com.panzhihua.common.model.vos.grid.EventMapGridVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
@@ -160,4 +162,25 @@
return R.ok(result);
}
+ @Override
+ public R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO){
+ return R.ok(eventGridMemberRelationMapper.getMapGridListsByApp(cascadeListDTO));
+ }
+
+ @Override
+ public R getMapGridsListsByApp(Long userId){
+ List<EventMapGridCascadeVO> resultList = new ArrayList<>();
+ List<EventMapGridCascadeVO> list = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,1,null);
+ if(!list.isEmpty()){
+ list.forEach(gridCascadeVO -> {
+ List<EventMapGridCascadeVO> childList = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,2,gridCascadeVO.getGridId());
+ if(!childList.isEmpty()){
+ gridCascadeVO.setChildList(childList);
+ resultList.add(gridCascadeVO);
+ }
+ });
+ }
+ return R.ok(resultList);
+ }
+
}
--
Gitblit v1.7.1