Merge remote-tracking branch 'origin/master'

沈斌

2018-01-30 b4cabe178f1a36433270c79048beecfab0edc487

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

@@ -75,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");

@@ -121,14 +124,16 @@
            organizationIds.add(account.getOrganizationId());

         }

      }

      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;

      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;

               }

            }

         }

      }