修改校验

whepi-web/src/main/java/com/bofeng/service/ScanService.java

@@ -231,11 +231,7 @@ public class ScanService {
         }
         List<MsReport> msReportList = msReportMapper.queryMsReportIsXGHome(userId);
         if (msReportList.size() > 0) {
-            if (ly2 && outUser2.getStartDate().getTime() < msReportList.get(0).getReportDate().getTime()) {
-                return 0;
-            } else if (!ly2) {
-                return 0;
-            }
+            return 0;
         }
         List<MsReport> msReports = msReportMapper.selectMsReportLate(userId, startDate);
         if (msReports.size() < intSize) {

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -673,13 +673,11 @@ public class ScanController {
             }
             List<MsReport> msReportList = msReportMapper.queryMsReportIsXGHome(userId);
             if (msReportList.size() > 0) {
-                if (outUser2.getStartDate().getTime() < msReportList.get(0).getReportDate().getTime()) {
-                    model.put("collor", "red");
-                    model.put("collor2", "red");
-                    model.put("into", "不可复工");
-                    model.put("errorMsg", "由于您的同住成员有新冠确诊或密切接触史人员，不可复工，如有疑问请联系直管领导。");
-                    return new ModelAndView("/user/returnWork.ftl", model);
-                }
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不可复工");
+                model.put("errorMsg", "由于您的同住成员有新冠确诊或密切接触史人员，不可复工，如有疑问请联系直管领导。");
+                return new ModelAndView("/user/returnWork.ftl", model);
             }
             List<MsReport> msReports = msReportMapper.selectMsReportLate(userId, startDate);
             if (msReports.size() < intSize) {