优化

tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysRoleMapper.java

@@ -1,8 +1,13 @@
 package com.tamguo.modules.sys.dao;
 
+import java.util.List;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.tamguo.config.dao.SuperMapper;
 import com.tamguo.modules.sys.model.SysRoleEntity;
+import com.tamguo.modules.sys.model.condition.SysRoleCondition;
 
 public interface SysRoleMapper extends SuperMapper<SysRoleEntity>{
 
+	List<SysRoleEntity> listData(SysRoleCondition condition, Page<SysRoleEntity> page);
+
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysRoleCondition.java

@@ -0,0 +1,21 @@
+package com.tamguo.modules.sys.model.condition;
+
+public class SysRoleCondition {
+	
+	private Integer pageNo;
+	private Integer pageSize;
+	
+	public Integer getPageNo() {
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+	public Integer getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	
+}

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java

@@ -1,5 +1,11 @@
 package com.tamguo.modules.sys.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.tamguo.modules.sys.model.SysRoleEntity;
+import com.tamguo.modules.sys.model.condition.SysRoleCondition;
+
 public interface ISysRoleService {
 
+	Page<SysRoleEntity> listData(SysRoleCondition condition);
+
 }

tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java

@@ -1,10 +1,26 @@
 package com.tamguo.modules.sys.service.impl;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.tamguo.modules.sys.dao.SysRoleMapper;
+import com.tamguo.modules.sys.model.SysRoleEntity;
+import com.tamguo.modules.sys.model.condition.SysRoleCondition;
 import com.tamguo.modules.sys.service.ISysRoleService;
 
 @Service
 public class SysRoleServiceImpl implements ISysRoleService{
 	
+	@Autowired
+	private SysRoleMapper sysRoleMapper;
+
+	@Transactional(readOnly=true)
+	@Override
+	public Page<SysRoleEntity> listData(SysRoleCondition condition) {
+		Page<SysRoleEntity> page = new Page<>(condition.getPageNo(), condition.getPageSize());
+		return page.setRecords(sysRoleMapper.listData(condition , page));
+	}
+
 }

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

@@ -1,7 +1,18 @@
 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 com.baomidou.mybatisplus.plugins.Page;
+import com.tamguo.modules.sys.model.SysRoleEntity;
+import com.tamguo.modules.sys.model.condition.SysRoleCondition;
+import com.tamguo.modules.sys.service.ISysRoleService;
+import com.tamguo.modules.sys.utils.Result;
 
 @Controller
 @RequestMapping(path="sys/role")
@@ -9,9 +20,19 @@ public class SysRoleController {
 
 	private final String ROLE_INDEX_PAGE = "modules/sys/role/index";
 	
+	@Autowired
+	private ISysRoleService iSysRoleService;
+
 	@RequestMapping(path="index")
 	public String index() {
 		return ROLE_INDEX_PAGE;
 	}
 	
+	@RequestMapping(path="listData",method=RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> listData(SysRoleCondition condition) {
+		Page<SysRoleEntity> page = iSysRoleService.listData(condition);
+		return Result.jqGridResult(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent(), page.getPages());
+	}
+	
 }

tamguo-oms/src/main/resources/mappers/SysRoleMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tamguo.modules.sys.dao.SysRoleMapper">
+	
+	<select id="listData" resultType="SysRoleEntity">
+		SELECT
+			r.role_code,
+			r.role_name,
+			r.role_type,
+			r.role_sort,
+			r.is_sys,
+			r.user_type,
+			r.data_scope,
+			r.`status`,
+			r.create_by,
+			r.create_date,
+			r.update_by,
+			r.update_date,
+			r.remarks,
+			r.corp_code,
+			r.corp_name
+		FROM
+			sys_role r
+	</select>
+</mapper>

tamguo-oms/src/main/resources/templates/include/leftMenu.html

@@ -28,7 +28,8 @@
 		     <li class="treeview"><a title="权限管理" href="javascript:" data-href="blank" class="addTabPage"><i class="fa fa-fw icon-social-dropbox"></i> <span>权限管理</span> <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a> 
 			      <ul class="treeview-menu"> 
 				       <li class="treeview"><a title="角色管理" href="javascript:" data-href="sys/role/index" class="addTabPage"><i class="fa fa-fw icon-people"></i> <span>角色管理</span></a></li>
-				       <li class="treeview"><a title="系统管理员" href="javascript:" data-href="/js/a/sys/corpAdmin/list" class="addTabPage"><i class="fa fa-fw icon-badge"></i> <span>系统管理员</span></a></li> 
+				       <li class="treeview"><a title="二级管理员" href="javascript:" data-href="sys/secAdmin/list" class="addTabPage"><i class="fa fa-fw icon-user-female"></i> <span>二级管理员</span></a></li> 
+				       <li class="treeview"><a title="系统管理员" href="javascript:" data-href="sys/corpAdmin/list" class="addTabPage"><i class="fa fa-fw icon-badge"></i> <span>系统管理员</span></a></li> 
 			      </ul>
 		     </li> 
 		     <li class="treeview"><a title="系统设置" href="javascript:" data-href="blank" class="addTabPage"><i class="fa fa-fw icon-settings"></i> <span>系统设置</span> <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a> 

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

@@ -30,7 +30,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 			</div>
 		</div>
 		<div class="box-body">
-<form id="searchForm" action="/js/a/sys/role/listData" method="post" class="form-inline hide" data-page-no="" data-page-size="" data-order-by="">
+<form id="searchForm" th:action="${setting.domain + 'sys/role/listData'}" method="post" class="form-inline hide" data-page-no="1" data-page-size="10" data-order-by="">
 				<div class="form-group">
 					<label class="control-label">角色名称：</label>
 					<div class="control-inline">