Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-07 501ebd43da6372ee753d422290327e339b04abb5

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

@@ -68,6 +68,9 @@
      if(pageBean.getPageSize()>0){

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

      }

      if(example.getOrderByClause() == null || example.getOrderByClause().isEmpty()) {

         example.setOrderByClause("create_time desc");

      }

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

      return new PageBean(organizationList);

   }