From ac9b292a5a162422024ca17d584ceaed0adb4e00 Mon Sep 17 00:00:00 2001 From: qiankunpingtai Date: Thu, 7 Mar 2019 15:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=BD=AC=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/OrganizationController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/jsh/erp/controller/OrganizationController.java b/src/main/java/com/jsh/erp/controller/OrganizationController.java index fb1864df..57bee4d0 100644 --- a/src/main/java/com/jsh/erp/controller/OrganizationController.java +++ b/src/main/java/com/jsh/erp/controller/OrganizationController.java @@ -55,7 +55,7 @@ public class OrganizationController { outer.put("orgFullName", org.getOrgFullName()); outer.put("orgAbr", org.getOrgAbr()); outer.put("orgParentNo", org.getOrgParentNo()); - List dataParentList = organizationService.findByOrgNo(org.getOrgNo()); + List dataParentList = organizationService.findByOrgNo(org.getOrgParentNo()); if(dataParentList!=null&&dataParentList.size()>0){ //父级机构名称显示简称 outer.put("orgParentName", dataParentList.get(0).getOrgAbr()); @@ -64,8 +64,15 @@ public class OrganizationController { outer.put("orgStcd", org.getOrgStcd()); outer.put("orgNo", org.getOrgNo()); outer.put("sort", org.getSort()); - outer.put("orgCreateTime", sdf.format(org.getOrgCreateTime())); - outer.put("orgStopTime", sdf.format(org.getOrgStopTime())); + /** + * 判断时间不为空再做转化 + * */ + if(org.getOrgCreateTime()!=null){ + outer.put("orgCreateTime", sdf.format(org.getOrgCreateTime())); + } + if(org.getOrgStopTime()!=null){ + outer.put("orgStopTime", sdf.format(org.getOrgStopTime())); + } outer.put("remark", org.getRemark()); } }