From 962357f6ae618e577f945c1ec934f8419a5a36d9 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 25 Aug 2022 14:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/AppUserServiceImpl.java  | 18 ++++++++++++++++--
 .../item/service/impl/ItemDeptServiceImpl.java |  2 +-
 .../dto/epdc/result/EpdcUserInfoResultDTO.java |  2 ++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index fbc9ee4f1..8ab291b3b 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -15,11 +15,12 @@ import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
 import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
-import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.form.PointLogFormDTO;
 import com.elink.esua.epdc.dto.form.UserLoginLogDTO;
+import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
 import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
@@ -56,7 +57,10 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -107,6 +111,9 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private PointsFeignClient pointFeignClient;
 
+    @Autowired
+    private CustomFeignClient customFeignClient;
+
     //private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png";
     private static String USER_FACE = "https://epdc-shibei.elinkservice.cn/epdcFile/M00/00/00/CgUipV3wgl6Afm4cAAAa8QfEb00266_big.png";
 
@@ -596,6 +603,13 @@ public class AppUserServiceImpl implements AppUserService {
         Result<EpdcUserInfoResultDTO> infoById = userFeignClient.getInfoById(userDetail.getUserId());
         EpdcUserInfoResultDTO data = infoById.getData();
         data.setIsSignUp(isSignIn);
+        //查询有无关联企业
+        Result<EnterpriseInfoResultDTO> enterInfo = customFeignClient.getEnterpriseInfoByUserId(data.getId());
+        if (enterInfo.success() && null != enterInfo.getData()) {
+            data.setHaveEnterprise(true);
+        } else {
+            data.setHaveEnterprise(false);
+        }
         return new Result<EpdcUserInfoResultDTO>().ok(data);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java
index 0e9f58a06..cab6a96b2 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java
@@ -102,7 +102,7 @@ public class ItemDeptServiceImpl extends BaseServiceImpl<ItemDeptDao, ItemDeptEn
         entity.setItemId(item.getId());
         entity.setDeptId(item.getGridId());
         entity.setDeptName(item.getGrid());
-        entity.setCreatedDeptId(Long.parseLong(item.getGrid()));
+        entity.setCreatedDeptId(item.getGridId());
         baseDao.insert(entity);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
index 85dd32ae0..077196267 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/result/EpdcUserInfoResultDTO.java
@@ -29,4 +29,6 @@ public class EpdcUserInfoResultDTO implements Serializable {
     private String allDeptIds;
     private String allDeptNames;
 
+    private Boolean haveEnterprise;
+
 }