优化

tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysPageController.java

@@ -0,0 +1,18 @@
+package com.tamguo.modules.sys.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 页面视图
+ */
+@Controller
+public class SysPageController {
+	
+	@RequestMapping("sys/{fn}/{page}")
+	public String page(@PathVariable("fn") String fn , @PathVariable("page") String page){
+		return "modules/sys/" + fn + "/" + page;
+	}
+	
+}

tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java

@@ -20,26 +20,16 @@ import com.tamguo.modules.sys.utils.Result;
 @RequestMapping(path="sys/role")
 public class SysRoleController {
 
-	// 角色列表
-	private final String ROLE_INDEX_PAGE = "modules/sys/role/index";
 	// 分配角色菜单权限
 	private final String ROLE_MENU_INDEX_PAGE = "modules/sys/role/menu";
 	// 数据权限
 	private final String ROLE_DATA_INDEX_PAGE = "modules/sys/role/dataScope";
-	// 授权用户
+
-	private final String ROLE_USER_INDEX_PAGE = "modules/sys/role/user";
-	
 	@Autowired
 	private ISysRoleService iSysRoleService;
 	@Autowired
 	private ISysRoleDataScopeService iSysRoleDataScopeService;
 
-	/** 角色首页*/
-	@RequestMapping(path="index")
-	public String index() {
-		return ROLE_INDEX_PAGE;
-	}
-	
 	/** 角色授权功能菜单*/
 	@RequestMapping(path="menu")
 	public ModelAndView menu(String roleCode , ModelAndView model) {
@@ -58,12 +48,6 @@ public class SysRoleController {
 		return model;
 	}
 	
-	/** 授权用户*/
-	@RequestMapping(path="user")
-	public String user() {
-		return ROLE_USER_INDEX_PAGE;
-	}
-	
 	/** 列表数据*/
 	@RequestMapping(path="listData",method=RequestMethod.POST)
 	@ResponseBody

tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java

@@ -1,13 +1,11 @@
 package com.tamguo.modules.sys.web;
 
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.tamguo.modules.sys.model.SysUserEntity;
@@ -19,29 +17,10 @@ import com.tamguo.modules.sys.utils.Result;
 @RequestMapping(path="sys/user")
 public class SysUserController {
 	
-	private final String USER_INDEX_PAGE = "modules/sys/user/index";
-	private final String USER_LIST_PAGE = "modules/sys/user/list";
-	private final String ROLE_USER_LIST_PAGE = "modules/sys/user/userSelect";
-	
 	
 	@Autowired
 	private ISysUserService iSysUserService;
 
-	@RequestMapping(path="index")
-	public String index(ModelAndView model) {
-		return USER_INDEX_PAGE;
-	}
-	
-	@RequestMapping(path="list")
-	public String list(ModelAndView model) {
-		return USER_LIST_PAGE;
-	}
-	
-	@RequestMapping(path="userSelect")
-	public String userSelect() {
-		return ROLE_USER_LIST_PAGE;
-	}
-	
 	@RequestMapping(path="listData",method=RequestMethod.POST)
 	@ResponseBody
 	public Map<String, Object> listData(SysUserCondition condition) {

tamguo-oms/src/main/resources/templates/modules/sys/role/user.html

@@ -73,7 +73,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 		</div>
 	</div>
 </div>
-<div class="hide"><div class="input-group treeselect" id="userSelectDiv" data-url="/js/a/sys/user/userSelect?userType=employee">
+<div class="hide"><div class="input-group treeselect" id="userSelectDiv" data-url="sys/user/userSelect?userType=employee">
 	<input id="userSelectCode" type="hidden" name="" value="" class="isReset"/>
 	<input id="userSelectName" type="text" name="" value=""
 		class="form-control  " readonly="readonly"

tamguo-oms/src/main/resources/templates/modules/sys/user/userSelect.html

@@ -20,7 +20,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 <div class="wrapper"><div class="main-content">
 	<div class="box box-main">
 		<div class="box-body">
-<form id="searchForm" action="/js/a/sys/user/listData" method="post" class="form-inline " data-page-no="" data-page-size="" data-order-by="">
+<form id="searchForm" th:action="${setting.domain + 'sys/user/listData'}" method="post" class="form-inline " data-page-no="1" data-page-size="10" data-order-by="">
 <input type="hidden" id="status" name="status" value="0"/>
 <input type="hidden" id="userType" name="userType" value="employee"/>
 				<div class="form-group">