Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 e60f6e849f43cb894fb96646de71304cf2524827

 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);

   }