From 09c223e57b45f17ae3364f5880d27a0cca0f6d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 4 Feb 2020 13:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=9A=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PartyMembersServiceImpl.java | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 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 2f0ec12dd..9605a119c 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
@@ -114,7 +114,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         PartyMembersDTO partyMembersDTO = baseDao.selectByIdNew(id);
         if (partyMembersDTO.getDeptStrIds() != null) {
             String depts[] = partyMembersDTO.getDeptStrIds().split(",");
-            partyMembersDTO.setAllDeptIds( depts);
+            partyMembersDTO.setAllDeptIds(depts);
         }
         return partyMembersDTO;
     }
@@ -162,15 +162,18 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     public void update(PartyMembersDTO dto) {
         PartyMembersEntity entity = ConvertUtils.sourceToTarget(dto, PartyMembersEntity.class);
         String[] allDeptIds = dto.getAllDeptIds();
-        Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(allDeptIds[allDeptIds.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());
+        //所属网格不填写的时候
+        if (allDeptIds != null && allDeptIds.length != 0) {
+            Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(allDeptIds[allDeptIds.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());
+            }
         }
         updateById(entity);