purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期转化时添加非空判断

Browse Source
This commit is contained in:
qiankunpingtai
2019-03-07 15:18:12 +08:00
parent 4801502e45
commit ac9b292a5a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/jsh/erp/controller/OrganizationController.java
View File

@@ -55,7 +55,7 @@ public class OrganizationController {
outer.put("orgFullName", org.getOrgFullName()); outer.put("orgFullName", org.getOrgFullName());
outer.put("orgAbr", org.getOrgAbr()); outer.put("orgAbr", org.getOrgAbr());
outer.put("orgParentNo", org.getOrgParentNo()); outer.put("orgParentNo", org.getOrgParentNo());
List<Organization> dataParentList = organizationService.findByOrgNo(org.getOrgNo()); List<Organization> dataParentList = organizationService.findByOrgNo(org.getOrgParentNo());
if(dataParentList!=null&&dataParentList.size()>0){ if(dataParentList!=null&&dataParentList.size()>0){
//父级机构名称显示简称 //父级机构名称显示简称
outer.put("orgParentName", dataParentList.get(0).getOrgAbr()); outer.put("orgParentName", dataParentList.get(0).getOrgAbr());
@@ -64,8 +64,15 @@ public class OrganizationController {
outer.put("orgStcd", org.getOrgStcd()); outer.put("orgStcd", org.getOrgStcd());
outer.put("orgNo", org.getOrgNo()); outer.put("orgNo", org.getOrgNo());
outer.put("sort", org.getSort()); 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()); outer.put("remark", org.getRemark());
} }
} }