From ee0e4c362e299f9be9a3859d0c142f26871cacf6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 9c7eba0..4c25ca1 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -7,19 +7,29 @@
import static org.apache.commons.lang3.StringUtils.isNumeric;
import static org.springframework.util.ObjectUtils.isEmpty;
+import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import com.github.pagehelper.PageHelper;
+import com.moral.common.bean.Constants;
+import com.moral.common.bean.PageBean;
import com.moral.common.exception.BusinessException;
import com.moral.entity.Account;
import com.moral.mapper.AccountMapper;
import com.moral.service.AccountService;
import com.moral.service.OrganizationService;
+
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
@Service
public class AccountServiceImpl implements AccountService {
@@ -73,10 +83,37 @@
Integer orgId = account.getOrganizationId();
// ���������������������������������������������������������������
- if (!(-1 == orgId || getValue("orgId").equals(orgId))) {
+ if (!(-1 == orgId || getValue("orgId").equals(orgId+""))) {
Set<Integer> orgIds = organizationService.getChildOrganizationIds(orgId);
parameters.put("orgIds", orgIds);
}
}
+ @Override
+ public PageBean<Account> getAccountListByPage(Map<String, Object> parameters) {
+ Example example = new Example(Account.class);
+ Criteria criteria = example.createCriteria();
+ if (parameters.containsKey("name")) {
+ criteria.andLike("name", "%" + (String) parameters.get("name") + "%");
+ }
+ if (parameters.containsKey("mobile")) {
+ criteria.andLike("mobile", "%" + (String) parameters.get("mobile") + "%");
+ }
+ PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize")));
+ List<Account> accounts = accountMapper.selectByExample(example);
+ return new PageBean<Account>(accounts);
+ }
+
+ @Override
+ @Transactional
+ public Integer saveOrUpdateAccount(Account account) {
+ if (ObjectUtils.isEmpty(account.getId())) {
+ account.setIsDelete(Constants.IS_DELETE_FALSE);
+ account.setCreateTime(new Date());
+ return accountMapper.insertSelective(account);
+ }else {
+ return accountMapper.updateByPrimaryKeySelective(account);
+ }
+ }
+
}
--
Gitblit v1.8.0