Browse Source

未选中二级部门报错

caotao 5 năm trước cách đây
mục cha
commit
535a49d67b

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

@@ -102,7 +102,7 @@ public class ScanController {
                 model.put("doorplate", unit.getRidgepole() + unit.getUnit());
                 model.put("door", uptownDoor.getDoorName());
             } else {
-                model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" + unit.getDoorplate() + "号");
+                model.put("doorplate", "员工号:" + unit.getDoorplate() + "");
                 model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
             }
             model.put("name", uptownHomes.get(0).getLinkman());
@@ -113,7 +113,7 @@ public class ScanController {
                 if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
                     model.put("into", "禁止" + getMsg(inType));
                     model.put("collor", "red");
-                    model.put("errorMsg", "非本小区居民,禁止" + getMsg(inType) + "。");
+                    model.put("errorMsg", "本公司员工,禁止" + getMsg(inType) + "。");
                     scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                     return new ModelAndView("/user/scan.ftl", model);
                 }