From b7a02f41a33158a7027cec12e40c67feba1063fd Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Mon, 30 Mar 2020 19:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8=E5=BC=82=E5=B8=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/PartyMembersController.java  | 2 +-
 .../elink/esua/epdc/service/impl/PartyMembersServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
index 02b900a23..b26ec61f4 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -82,7 +82,7 @@ public class PartyMembersController {
     @GetMapping("{id}")
     public Result<PartyMembersDTO> get(@PathVariable("id") String id) {
         PartyMembersDTO data = partyMembersService.get(id);
-        if (data.getTagIds() != null) {
+        if (null != data && data.getTagIds() != null) {
             data.setTagIdsNew(data.getTagIds().split(","));
         }
         return new Result<PartyMembersDTO>().ok(data);
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 9d2d4a082..e97b82714 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
@@ -169,7 +169,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     @DataSource(value = DataSourceNames.FIRST)
     public PartyMembersDTO get(String id) {
         PartyMembersDTO partyMembersDTO = baseDao.selectByIdNew(id);
-        if (partyMembersDTO.getDeptStrIds() != null) {
+        if (null != partyMembersDTO && partyMembersDTO.getDeptStrIds() != null) {
             String depts[] = partyMembersDTO.getDeptStrIds().split(",");
             partyMembersDTO.setAllDeptIds(depts);
         }