From 539a7077cbf638a5aa9ae5e46c17be96daba7d9b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 02 Jul 2018 10:54:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index fc181d0..3b24c86 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -6,7 +6,6 @@
import com.moral.common.util.ExampleUtil;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Organization;
-import com.moral.entity.exp.OrganizationExp;
import com.moral.entity.OrganizationRelation;
import com.moral.mapper.OrganizationMapper;
import com.moral.mapper.OrganizationRelationMapper;
@@ -41,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);
}
}
@@ -61,20 +60,25 @@
List<Example.Criteria> criteriaList = example.getOredCriteria();
if(criteriaList!=null&&criteriaList.size()>0){
for(Example.Criteria cri : criteriaList){
- cri.andNotEqualTo("isDelete","1");
+ cri.andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);
}
}else {
- example.or().andNotEqualTo("isDelete","1");
+ example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);
}
- PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
- List<OrganizationExp> organizationExpandList = organizationMapper.selectWithAreaNameByExample(example);
- return new PageBean(organizationExpandList);
+ 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);
}
public void addOrModify(Organization organization){
try{
if(organization.getId()==null){
//���������������������������������������
- organization.setIsDelete("0");
+ organization.setIsDelete(Constants.IS_DELETE_FALSE);
organizationMapper.insertSelective(organization);
}else{
organizationMapper.updateByPrimaryKeySelective(organization);
@@ -88,7 +92,7 @@
@Override
public void deleteByIds(Integer... ids) {
Organization organization = new Organization();
- organization.setIsDelete("1");
+ organization.setIsDelete(Constants.IS_DELETE_TRUE);
if(ids!=null&&ids.length>0){
if(ids.length==1){
organization.setId(ids[0]);
@@ -104,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