From 16bd05b9518086e6d53c561ecdfd47c1e5bfe4f6 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 12 Nov 2020 16:27:10 +0800
Subject: [PATCH] =?UTF-8?q?extstaffinfo=20=20=20=20=20=20=E8=BD=AC?=
 =?UTF-8?q?=E8=AE=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java  | 2 ++
 .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java
index 16ac17dca2..399062ece8 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -73,6 +74,7 @@ public class IssueShiftedFromTopicFormDTO implements Serializable {
     /**
      * 议题创建时间
      * */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdTime;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 17f0ae9f5e..7cf683e111 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -594,14 +594,15 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         //查找工作人员信息
         //最近一次登陆的而网格、人员信息、权限
         ExtStaffInfoResultDTO result = baseDao.selectStaffInfoExt(staffParam.getStaffId());
-        result.setUserId(staffParam.getStaffId());
         if(null != result) {
+			result.setUserId(staffParam.getStaffId());
             Result<ExtStaffInfoResultDTO> govOrgResult =
                 govOrgOpenFeignClient.staffInfoExt(result);
             if(govOrgResult.success() && null != govOrgResult.getData()){
                 return govOrgResult.getData();
             }
         }
+		log.warn("com.epmet.service.impl.CustomerStaffServiceImpl.extStaffInfo，根据传入的用户Id未找到对应的工作人员，传参：{}",JSON.toJSONString(staffParam));
         return null;
     }