From 8ad473d0e87886501a73cc408ebe7efbff25f373 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:16:01 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 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 c572a32..c9b2192 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -4,15 +4,16 @@
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import com.moral.common.util.ValidateUtil;
import com.moral.entity.Organization;
import com.moral.entity.OrganizationRelation;
-import com.moral.entity.OrganizationRelationExample;
import com.moral.mapper.OrganizationMapper;
import com.moral.mapper.OrganizationRelationMapper;
import com.moral.service.OrganizationService;
@@ -30,11 +31,11 @@
public Set<Integer> getChildOrganizationIds(Integer orgId){
Set<Integer> orgIds = new HashSet<Integer>();
orgIds.add(orgId);
- OrganizationRelationExample example = new OrganizationRelationExample();
- example.or().andParentIdEqualTo(orgId);
+ OrganizationRelation relation = new OrganizationRelation();
+ relation.setParentId(orgId);
Organization organization = organizationMapper.selectByPrimaryKey(orgId);
if (IS_DELETE_FALSE.equals(organization.getIsDelete())) {
- List<OrganizationRelation> organizationRelations = organizationRelationMapper.selectByExample(example);
+ List<OrganizationRelation> organizationRelations = organizationRelationMapper.select(relation);
for (OrganizationRelation organizationRelation : organizationRelations) {
Set<Integer> organizationIds = getChildOrganizationIds(organizationRelation.getParentId());
orgIds.addAll(organizationIds);
@@ -43,4 +44,12 @@
return orgIds;
}
+
+ @Override
+ public List<Organization> getOrganizationsByAreaName(Map<String, Object> parameters) {
+ ValidateUtil.notNull(parameters.get("areaName"), "param.is.null");
+ List<Organization> organizations = organizationMapper.getOrganizationsByAreaName(parameters);
+ return organizations;
+ }
+
}
--
Gitblit v1.8.0