From f608fc718f44aec5873b0ba6adf68887b241866d Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Sat, 29 Feb 2020 00:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml      | 6 ++++++
 .../elink/esua/epdc/dto/form/CompleteRequisiteInfoDTO.java  | 4 +++-
 .../enterprise/service/impl/EnterpriseInfoServiceImpl.java  | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml
index fb4e2c8d7..234c965cf 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/pom.xml
@@ -57,6 +57,12 @@
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-oss-client</artifactId>
             <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/CompleteRequisiteInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/CompleteRequisiteInfoDTO.java
index 3951c73c1..154335cfe 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/CompleteRequisiteInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/CompleteRequisiteInfoDTO.java
@@ -64,8 +64,10 @@ public class CompleteRequisiteInfoDTO implements Serializable {
     private String encryptedData;
 
 
-    private String userId;
+    // 以上为接口参数，下面是方法填充的参数，用于模块间传送数据
+
 
+    private String userId;
 
     private String wxUnionId;
 
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
index ea75bafe2..917ca8da3 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
@@ -141,6 +141,8 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
         //保存到企业数据库
         EnterpriseInfoEntity enterpriseInfo = ConvertUtils.sourceToTarget(fromDto, EnterpriseInfoEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(fromDto.getDeptId()));
+
+        String gridName ;
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
         } else {
@@ -149,6 +151,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
             enterpriseInfo.setAllDeptNames(deptDTO.getAllDeptNames());
             enterpriseInfo.setParentDeptIds(deptDTO.getParentDeptIds());
             enterpriseInfo.setParentDeptNames(deptDTO.getParentDeptNames());
+            gridName = deptDTO.getGrid();
         }
         if (StringUtils.isNotBlank(fromDto.getId())) {
             baseDao.updateById(enterpriseInfo);
@@ -158,6 +161,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
         //更新用户表数据
         CompleteRequisiteUserInfoDTO userInfoDTO = ConvertUtils.sourceToTarget(fromDto, CompleteRequisiteUserInfoDTO.class);
         userInfoDTO.setDwellingPlace(enterpriseInfo.getEnterpriseAddress());
+        userInfoDTO.setGrid(gridName);
         userFeignClient.completeRequisiteInfo(userInfoDTO);
         return new Result();
     }