diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java index 9730197a..45062813 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java @@ -60,6 +60,7 @@ public class AreaController extends BaseController { @RequiresPermissions("sys:area:view") @RequestMapping(value = "list") public String list(Area area, Model model) { + model.addAttribute("area", area); return "modules/sys/areaList"; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java index 43c29841..221b04cd 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -62,7 +61,8 @@ public class CompanyController extends BaseController { */ @RequiresPermissions("sys:company:view") @RequestMapping(value = "list") - public String list(Company company, HttpServletRequest request, HttpServletResponse response, Model model) { + public String list(Company company, Model model) { + model.addAttribute("company", company); return "modules/sys/companyList"; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java index d292c815..aa4e8bdb 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java @@ -23,7 +23,6 @@ import com.jeesite.common.config.Global; import com.jeesite.common.idgen.IdGen; import com.jeesite.common.lang.StringUtils; import com.jeesite.common.web.BaseController; -import com.jeesite.modules.sys.entity.EmpUser; import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.service.OfficeService; import com.jeesite.modules.sys.utils.UserUtils; @@ -58,7 +57,8 @@ public class OfficeController extends BaseController { */ @RequiresPermissions("sys:office:view") @RequestMapping(value = "index") - public String index(EmpUser empUser, Model model) { + public String index(Office office, Model model) { + model.addAttribute("office", office); return "modules/sys/officeIndex"; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java index 2ff6c204..17b8e177 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java @@ -50,6 +50,7 @@ public class PostController extends BaseController { @RequiresPermissions("sys:post:view") @RequestMapping(value = "list") public String list(Post post, Model model) { + model.addAttribute("post", post); return "modules/sys/postList"; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index abe0db87..0c120f4b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -61,6 +61,7 @@ public class CorpAdminController extends BaseController { public String list(User user, Model model) { user.setCorpCode(null); user.setCorpName(null); + model.addAttribute("user", user); return "modules/sys/user/corpAdminList"; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index 106a1032..cc4d088a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -82,6 +82,7 @@ public class EmpUserController extends BaseController { @RequiresPermissions("sys:empUser:view") @RequestMapping(value = "index") public String index(EmpUser empUser, Model model) { + model.addAttribute("empUser", empUser); return "modules/sys/user/empUserIndex"; } @@ -91,6 +92,7 @@ public class EmpUserController extends BaseController { // 获取岗位列表 Post post = new Post(); model.addAttribute("postList", postService.findList(post)); + model.addAttribute("empUser", empUser); return "modules/sys/user/empUserList"; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java index 76669627..0315a51b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/SecAdminController.java @@ -47,6 +47,7 @@ public class SecAdminController extends BaseController { @RequiresPermissions("sys:secAdmin:view") @RequestMapping(value = "list") public String list(User user, Model model) { + model.addAttribute("user", user); return "modules/sys/user/secAdminList"; }