修复党员列表修改bug

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) {
+        if (allDeptIds != null && allDeptIds.length != 0) {
-            throw new RenException("获取部门信息失败");
+            Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(allDeptIds[allDeptIds.length - 1]));
-        } else {
+            if (!parentResult.success() || parentResult.getData() == null) {
-            ParentAndAllDeptDTO deptDTO = parentResult.getData();
+                throw new RenException("获取部门信息失败");
-            entity.setAllDeptIds(deptDTO.getAllDeptIds());
+            } else {
-            entity.setAllDeptNames(deptDTO.getAllDeptNames());
+                ParentAndAllDeptDTO deptDTO = parentResult.getData();
-            entity.setParentDeptIds(deptDTO.getParentDeptIds());
+                entity.setAllDeptIds(deptDTO.getAllDeptIds());
-            entity.setParentDeptNames(deptDTO.getParentDeptNames());
+                entity.setAllDeptNames(deptDTO.getAllDeptNames());
+                entity.setParentDeptIds(deptDTO.getParentDeptIds());
+                entity.setParentDeptNames(deptDTO.getParentDeptNames());
+            }
         }
         updateById(entity);