Merge remote-tracking branch 'origin/master'

fengxiang

2018-01-26 e125b445697a6b8c2b5cc5c57f31249c5088c1c9

 src/main/java/com/moral/service/impl/AccountServiceImpl.java

@@ -9,6 +9,7 @@


import java.util.Date;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.Set;

@@ -74,7 +75,10 @@
      account.setAccountName(accountName);

      return accountMapper.selectOne(account);

   }



   @Override

   public Account getAccountById(Integer id){

      return accountMapper.selectByPrimaryKey(id);

   }

   @Override

   public void setOrgIdsByAccount(Map<String, Object> parameters) {

      String accountId = (String) parameters.get("accountId");

@@ -114,12 +118,26 @@
      }

      PageHelper.startPage(Integer.valueOf((String) parameters.get("pageIndex")), Integer.valueOf((String) parameters.get("pageSize")));

      List<Account> accounts = accountMapper.selectByExample(example);

      Set<Integer> organizationIds = new HashSet<Integer>();

      for (Account account : accounts) {

         if (!ObjectUtils.isEmpty(account.getOrganizationId())) {

            Organization organization = organizationMapper.selectByPrimaryKey(account.getOrganizationId());

            account.setOrganization(organization);

            organizationIds.add(account.getOrganizationId());

         }

      }

      if(!ObjectUtils.isEmpty(organizationIds)){

         example = new Example(Organization.class);

         example.or().andIn("id", organizationIds);

         List<Organization> organizations = organizationMapper.selectByExample(example);

         for (Account account : accounts) {

            for (Organization organization : organizations) {

               if (account.getOrganizationId() == organization.getId()) {

                  account.setOrganization(organization);

                  break;

               }

            }

         }

      }



      return new PageBean<Account>(accounts);

   }