From aa6c487c0eccd86311489e8a0ed641618e5b9105 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 04 Jan 2018 16:17:41 +0800
Subject: [PATCH] 组织模块

---
 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index 4afe161..25f7e45 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -3,6 +3,7 @@
 import com.github.pagehelper.PageHelper;
 import com.moral.common.bean.PageBean;
 import com.moral.common.util.ExampleUtil;
+import com.moral.common.util.MyBatisBaseMapUtil;
 import com.moral.common.util.ValidateUtil;
 import com.moral.entity.Organization;
 import com.moral.entity.exp.OrganizationExp;
@@ -12,6 +13,7 @@
 import com.moral.service.OrganizationService;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.mapperhelper.SqlHelper;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -56,6 +58,7 @@
 
 	public PageBean queryByPageBean(PageBean pageBean){
 		Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
+		//me
 		List<Example.Criteria> criteriaList = example.getOredCriteria();
 		if(criteriaList!=null&&criteriaList.size()>0){
 			for(Example.Criteria cri : criteriaList){
@@ -65,8 +68,8 @@
 			example.or().andNotEqualTo("isDelete","1");
 		}
 		PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
-		List<OrganizationExp> organizationExpandList = organizationMapper.selectWithAreaNameByExample(example);
-		return new PageBean(organizationExpandList);
+		List page = organizationMapper.selectWithAreaNameByExample(example);
+		return  new PageBean(page);
 	}
 	public void addOrModify(Organization organization){
 		try{

--
Gitblit v1.8.0