From 62520477e6ac5fc8ccce28fdb69ec26246a4a37b Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 02 Jul 2018 11:27:14 +0800
Subject: [PATCH] 优化 大屏数据排名接口
---
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index b25df79..3b24c86 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -40,7 +40,7 @@
if (IS_DELETE_FALSE.equals(organization.getIsDelete())) {
List<OrganizationRelation> organizationRelations = organizationRelationMapper.select(relation);
for (OrganizationRelation organizationRelation : organizationRelations) {
- Set<Integer> organizationIds = getChildOrganizationIds(organizationRelation.getParentId());
+ Set<Integer> organizationIds = getChildOrganizationIds(organizationRelation.getChildId());
orgIds.addAll(organizationIds);
}
}
@@ -65,7 +65,12 @@
}else {
example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);
}
- PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
+ if(pageBean.getPageSize()>0){
+ PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
+ }
+ if(example.getOrderByClause() == null || example.getOrderByClause().isEmpty()) {
+ example.setOrderByClause("create_time desc");
+ }
List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);
return new PageBean(organizationList);
}
@@ -103,12 +108,22 @@
@Override
public List<Organization> getOrganizationsByName(String name) {
+ ValidateUtil.notEmpty(name, "param.is.null");
Example example = new Example(Organization.class);
Criteria criteria = example.createCriteria();
- criteria.andLike("name", "%" + name + "%");
- criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+
+ criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andLike("name", "%" + name + "%");
+ example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andCondition("getPY(name) like ", "%" + name + "%");
+
List<Organization> organizations = organizationMapper.selectByExample(example);
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