From 3120cdd01c8e6a2a1edefb6ff251c026f44dee5c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Feb 2018 11:40:31 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/service/impl/OrganizationServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index 5c6e57c..92e9a0c 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;
@@ -61,20 +60,22 @@
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());
+ }
+ 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 +89,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]);
--
Gitblit v1.8.0