Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/web/WindowOwnerController.java

@@ -91,9 +91,9 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
             this.addDict(model, "hallId", hallMap);
         }
 
-//        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
-//                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
-//        this.addDict(model, "updateUserId", collect);
+        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
+                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
+        this.addDict(model, "updateUserId", collect);
         this.addDict(model, "deptId", deptService.getDeptBySalaId(-1l).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
         this.addDict(model, "salaId", deptService.getAllSala().stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
         this.addDict(model, "roleType", WindowRoleType.getEnumMap());