From 00faf1e57863b88c0db1c4457826790ad00c0195 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Sat, 29 Feb 2020 10:25:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiCustomEnterpriseController.java        |  3 +-
 .../epdc/service/CustomEnterpriseService.java |  2 +-
 .../impl/CustomEnterpriseServiceImpl.java     | 28 +++++++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java
index dd521cb61..a3ceffb96 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java
@@ -46,8 +46,7 @@ public class ApiCustomEnterpriseController {
      **/
     @GetMapping("getByUserId")
     public Result<EnterpriseInfoResultDTO> getByUserId(@LoginUser TokenDto tokenDto) {
-        String userId = tokenDto.getUserId();
-        return customEnterpriseService.selectOneEnterpriseInfo(userId);
+        return customEnterpriseService.selectOneEnterpriseInfo(tokenDto);
     }
 
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java
index e8957f938..b9ab455ba 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomEnterpriseService.java
@@ -33,7 +33,7 @@ public interface CustomEnterpriseService {
      * @Date 2020/2/28
      * @Param [userId]
      **/
-    Result<EnterpriseInfoResultDTO> selectOneEnterpriseInfo(String userId);
+    Result<EnterpriseInfoResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto);
 
     /***
      * 完善企业信息，必填表单
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
index a57179bc5..94bc407be 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
@@ -3,8 +3,10 @@ package com.elink.esua.epdc.service.impl;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
@@ -36,6 +38,9 @@ public class CustomEnterpriseServiceImpl implements CustomEnterpriseService {
     @Autowired
     private CustomFeignClient customFeignClient;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Autowired
     private WxMaServiceUtils wxMaServiceUtils;
 
@@ -45,8 +50,27 @@ public class CustomEnterpriseServiceImpl implements CustomEnterpriseService {
     }
 
     @Override
-    public Result<EnterpriseInfoResultDTO> selectOneEnterpriseInfo(String userId) {
-        return customFeignClient.getEnterpriseInfoByUserId(userId);
+    public Result<EnterpriseInfoResultDTO> selectOneEnterpriseInfo(TokenDto tokenDto) {
+
+        Result<EnterpriseInfoResultDTO> enterpriseResult = customFeignClient.getEnterpriseInfoByUserId(tokenDto.getUserId());
+        if (enterpriseResult.success()) {
+            EnterpriseInfoResultDTO enterpriseInfo = enterpriseResult.getData();
+            if (null == enterpriseInfo) {
+                enterpriseInfo = new EnterpriseInfoResultDTO();
+                enterpriseInfo.setDeptId(tokenDto.getGridId());
+                //未完善信息获取用户当前所在的网格的后两级机构（社区-网格），返回给前端
+                Result<ParentAndAllDeptDTO> resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(tokenDto.getGridId());
+                if (resultParentAndAllDeptDTO.success() && null != resultParentAndAllDeptDTO.getData()) {
+                    String allDeptNames = resultParentAndAllDeptDTO.getData().getAllDeptNames();
+                    if (StringUtils.isNotBlank(allDeptNames)) {
+                        String gridName = allDeptNames.substring(allDeptNames.lastIndexOf("-", allDeptNames.lastIndexOf("-") - 1) + 1);
+                        enterpriseInfo.setDeptName(gridName);
+                    }
+                }
+            }
+            return new Result().ok(enterpriseInfo);
+        }
+        return new Result().error("查询企业信息失败");
     }