Merge remote-tracking branch 'origin/dev2' into dev2

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -728,7 +728,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
     public ReportDeVO reReportDetail(Integer reportId) {
         ReportDeVO reportDeVO = new ReportDeVO();
         //检测传入参数合法性
-        if (reportId == null && reportId <= 0) {
+        if (reportId == null || reportId <= 0) {
             throw new XiaoShiException("传入参数异常");
         }
         //根据报告id获得报告