update
This commit is contained in:
@@ -60,6 +60,7 @@ public class AreaController extends BaseController {
|
|||||||
@RequiresPermissions("sys:area:view")
|
@RequiresPermissions("sys:area:view")
|
||||||
@RequestMapping(value = "list")
|
@RequestMapping(value = "list")
|
||||||
public String list(Area area, Model model) {
|
public String list(Area area, Model model) {
|
||||||
|
model.addAttribute("area", area);
|
||||||
return "modules/sys/areaList";
|
return "modules/sys/areaList";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -62,7 +61,8 @@ public class CompanyController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@RequiresPermissions("sys:company:view")
|
@RequiresPermissions("sys:company:view")
|
||||||
@RequestMapping(value = "list")
|
@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";
|
return "modules/sys/companyList";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ import com.jeesite.common.config.Global;
|
|||||||
import com.jeesite.common.idgen.IdGen;
|
import com.jeesite.common.idgen.IdGen;
|
||||||
import com.jeesite.common.lang.StringUtils;
|
import com.jeesite.common.lang.StringUtils;
|
||||||
import com.jeesite.common.web.BaseController;
|
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.entity.Office;
|
||||||
import com.jeesite.modules.sys.service.OfficeService;
|
import com.jeesite.modules.sys.service.OfficeService;
|
||||||
import com.jeesite.modules.sys.utils.UserUtils;
|
import com.jeesite.modules.sys.utils.UserUtils;
|
||||||
@@ -58,7 +57,8 @@ public class OfficeController extends BaseController {
|
|||||||
*/
|
*/
|
||||||
@RequiresPermissions("sys:office:view")
|
@RequiresPermissions("sys:office:view")
|
||||||
@RequestMapping(value = "index")
|
@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";
|
return "modules/sys/officeIndex";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ public class PostController extends BaseController {
|
|||||||
@RequiresPermissions("sys:post:view")
|
@RequiresPermissions("sys:post:view")
|
||||||
@RequestMapping(value = "list")
|
@RequestMapping(value = "list")
|
||||||
public String list(Post post, Model model) {
|
public String list(Post post, Model model) {
|
||||||
|
model.addAttribute("post", post);
|
||||||
return "modules/sys/postList";
|
return "modules/sys/postList";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ public class CorpAdminController extends BaseController {
|
|||||||
public String list(User user, Model model) {
|
public String list(User user, Model model) {
|
||||||
user.setCorpCode(null);
|
user.setCorpCode(null);
|
||||||
user.setCorpName(null);
|
user.setCorpName(null);
|
||||||
|
model.addAttribute("user", user);
|
||||||
return "modules/sys/user/corpAdminList";
|
return "modules/sys/user/corpAdminList";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ public class EmpUserController extends BaseController {
|
|||||||
@RequiresPermissions("sys:empUser:view")
|
@RequiresPermissions("sys:empUser:view")
|
||||||
@RequestMapping(value = "index")
|
@RequestMapping(value = "index")
|
||||||
public String index(EmpUser empUser, Model model) {
|
public String index(EmpUser empUser, Model model) {
|
||||||
|
model.addAttribute("empUser", empUser);
|
||||||
return "modules/sys/user/empUserIndex";
|
return "modules/sys/user/empUserIndex";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,6 +92,7 @@ public class EmpUserController extends BaseController {
|
|||||||
// 获取岗位列表
|
// 获取岗位列表
|
||||||
Post post = new Post();
|
Post post = new Post();
|
||||||
model.addAttribute("postList", postService.findList(post));
|
model.addAttribute("postList", postService.findList(post));
|
||||||
|
model.addAttribute("empUser", empUser);
|
||||||
return "modules/sys/user/empUserList";
|
return "modules/sys/user/empUserList";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ public class SecAdminController extends BaseController {
|
|||||||
@RequiresPermissions("sys:secAdmin:view")
|
@RequiresPermissions("sys:secAdmin:view")
|
||||||
@RequestMapping(value = "list")
|
@RequestMapping(value = "list")
|
||||||
public String list(User user, Model model) {
|
public String list(User user, Model model) {
|
||||||
|
model.addAttribute("user", user);
|
||||||
return "modules/sys/user/secAdminList";
|
return "modules/sys/user/secAdminList";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user