From 7fb0113fb5bcb16d6e2930ba41020aff9c088be0 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 25 Sep 2018 10:45:03 +0800
Subject: [PATCH] 地图 更新

---
 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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..7b8d709 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);
     		}
 		}
@@ -68,12 +68,13 @@
 		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);
 		return new PageBean(organizationList);
 	}
+	@Override
 	public void addOrModify(Organization organization){
 		try{
 			if(organization.getId()==null){
@@ -81,7 +82,7 @@
 				organization.setIsDelete(Constants.IS_DELETE_FALSE);
 				organizationMapper.insertSelective(organization);
 			}else{
-				organizationMapper.updateByPrimaryKeySelective(organization);
+				organizationMapper.updateByPrimaryKey(organization);
 			}
 		}
 		catch (Exception ex){
@@ -119,4 +120,11 @@
 		return organizations;
 	}
 
+	@Override
+	public Organization getOrganizationById(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