Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-02 539a7077cbf638a5aa9ae5e46c17be96daba7d9b

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

@@ -40,7 +40,7 @@
       if (IS_DELETE_FALSE.equals(organization.getIsDelete())) {

          List<OrganizationRelation> organizationRelations = organizationRelationMapper.select(relation);

          for (OrganizationRelation organizationRelation : organizationRelations) {

             Set<Integer> organizationIds = getChildOrganizationIds(organizationRelation.getParentId());

             Set<Integer> organizationIds = getChildOrganizationIds(organizationRelation.getChildId());

             orgIds.addAll(organizationIds);

          }

      }