diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java index a1bdc921..c96fe152 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java @@ -3,6 +3,7 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.role.list.ports.RoleListPortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -14,10 +15,14 @@ import org.springframework.web.bind.annotation.ModelAttribute; public class AdminCreateGetController { private final RoleListPortIn roleListPortIn; + private final UICodeListPortIn uiCodeListPortIn; @GetMapping(path = "/settings/admins/create") String operate(Model model, @ModelAttribute("bindingVO") AdminCreateBindingVO bindingVO) { + model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); + model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main")); + return "admin/adminCreateForm"; } } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java index 3da1926e..95b881d2 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java @@ -21,6 +21,7 @@ public class AdminCreateBindingVO { "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", message = "{valid.common.email.wrong}") private String email; + private String regionMainCode; private Boolean accountDisabled; private Boolean accountLocked; diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index dd4e2499..b8b734c0 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -51,7 +51,8 @@