Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

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

@@ -65,7 +65,9 @@
      }else {

         example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);

      }

      PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());

      if(pageBean.getPageSize()>0){

         PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());

      }

      List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);

      return new PageBean(organizationList);

   }