From 54164a5faa4bb8a29f38d250b40423d333b56f7f Mon Sep 17 00:00:00 2001
From: wyj2080 <1603068044@qq.com>
Date: Fri, 24 Apr 2020 13:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=8E=A8=E5=B9=BF=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E5=8C=BA=E5=9F=9F=E7=94=A8=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RetailCompanyController.java      | 16 ++++++++++++++++
 .../generalize/service/RetailCompanyService.java | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java b/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java
index 8b552cb..6adfd18 100644
--- a/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java
+++ b/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java
@@ -56,6 +56,22 @@ public class RetailCompanyController extends BaseController {
         }
     }
 
+    /**
+     * 查询所有的组织数据
+     * @return 组织数据集合
+     */
+    @ResponseBody
+    @GetMapping("/org")
+    public Map<String,Object> listOfRetailCompany(@RequestParam("userId") long userId){
+        try{
+            List<PrivilageOrganizational> privilageOrganizationals = retailCompanyService.listOfRetailOrg(userId);
+            return data(privilageOrganizationals);
+        }catch (Exception e){
+            log.error("查询所有的组织数据失败",e);
+            return fail();
+        }
+    }
+
     /**
      * 查询所有的零售公司数据
      * @return 零售公司数据集合
diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
index 8ed4931..bdd8217 100644
--- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
+++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
@@ -107,6 +107,22 @@ public class RetailCompanyService {
         }
     }
 
+    /**
+     * 查询所有的组织数据信息
+     */
+    public List<PrivilageOrganizational> listOfRetailOrg(long userId){
+        QueryWrapper<PrivilageOrganizationalMember> wrapper1 = new QueryWrapper<>();
+        wrapper1.eq("user_id",userId);
+        List<PrivilageOrganizationalMember> pm = organizationalMemberMapper.selectList(wrapper1);
+        QueryWrapper<PrivilageOrganizational> wrapper = new QueryWrapper<>();
+        if(pm.isEmpty()) {
+            return new ArrayList<>();
+        }else {
+            wrapper.eq("type", 1).eq("status", 1).in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId).collect(Collectors.toList()));
+            List<PrivilageOrganizational> privilageOrganizationals = retailCompanyMapper.selectList(wrapper);
+            return privilageOrganizationals;
+        }
+    }
 
     /**
      * 查询所有的零售公司信息