Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-07 501ebd43da6372ee753d422290327e339b04abb5

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

@@ -171,4 +171,14 @@
        }).collect(Collectors.toList());

        return list;

    }



    @Override

   public List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId) {

      MonitorPoint monitorPoint = new MonitorPoint();

      monitorPoint.setIsDelete(Constants.IS_DELETE_FALSE);

      if (Constants.isNotSpecialOrgId(orgId)) {

         monitorPoint.setOrganizationId(orgId);

      }

      return monitorPointMapper.select(monitorPoint);

   }

}