凌云集团更改公司

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

@@ -184,9 +184,10 @@ public class ScanController {
                         return new ModelAndView("/user/scan.ftl", model);
                     }
                     if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
-                        model.put("into", "禁止" + getMsg(inType));
                         model.put("collor", "red");
-                        model.put("errorMsg", "非本小区居民，禁止" + getMsg(inType) + "。");
+                        model.put("collor2", "red");
+                        model.put("into", "不许进入");
+                        model.put("errorMsg", "非本公司员工，不许进入。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -266,9 +267,10 @@ public class ScanController {
                         return new ModelAndView("/user/scanHC.ftl", model);
                     }
                     if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
-                        model.put("into", "禁止" + getMsg(inType));
                         model.put("collor", "red");
-                        model.put("errorMsg", "非本小区居民，禁止" + getMsg(inType) + "。");
+                        model.put("collor2", "red");
+                        model.put("into", "不许进入");
+                        model.put("errorMsg", "非本公司员工，不许进入。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scanHC.ftl", model);
                     }