From b0ac7ee8d514939fe727fed074f6f5adb3145a0b Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Fri, 6 Dec 2019 13:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=85=9A?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PartyMembersServiceImpl.java | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index 7bf9a0b7b..a1babd571 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -113,14 +113,30 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyMembersDTO dto) {
+        PartyMembersEntity entity = new PartyMembersEntity();
         //通过用户审核添加的党员
         if (dto.getRegistTime() != null) {
-            dto.setRegistFlag(YesOrNoEnum.YES.value());
+            entity.setRegistFlag(YesOrNoEnum.YES.value());
         } else {
-            dto.setRegistFlag(YesOrNoEnum.NO.value());
-            dto.setRegistTime(new Date());
+            entity.setRegistFlag(YesOrNoEnum.NO.value());
+            entity.setRegistTime(new Date());
+        }
+        entity.setRealName(dto.getRealName());
+        entity.setMobile(dto.getMobile());
+        entity.setIdentityNo(dto.getIdentityNo());
+        Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length-1]);
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取部门信息失败");
+        }else {
+            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+            entity.setGridId(Long.valueOf(dto.getAllDeptIds()[dto.getAllDeptIds().length-1]));
+            String[] split = deptDTO.getAllDeptNames().split("-");
+            entity.setGridName(split[split.length-1]);
         }
-        PartyMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyMembersEntity.class);
         insert(entity);
 
         JSONArray jsonArray = JSON.parseArray(dto.getTagIds());