From 052fd7444c1c2852fd9fd07876438c2ed9a5b45a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 07 May 2018 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index 83ce35b..f38fe9e 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -68,7 +68,7 @@
if(pageBean.getPageSize()>0){
PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
}
- if(example.getOrderByClause().isEmpty()) {
+ if(example.getOrderByClause() == null || example.getOrderByClause().isEmpty()) {
example.setOrderByClause("create_time desc");
}
List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);
@@ -119,4 +119,11 @@
return organizations;
}
+ @Override
+ public Organization getOrganizationsById(int id) {
+ Example example = new Example(ENTITY_CLASS);
+ example.or().andEqualTo("id",id);
+ List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);
+ return organizationList.size()>0?organizationList.get(0):null;
+ }
}
--
Gitblit v1.8.0