education sys 1.01

src/main/java/org/rcisoft/core/service/impl/AuthenticationServiceImpl.java

@@ -38,16 +38,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
     @Autowired
     private PasswordEncoder passwordEncoder;
 
-    /*@Autowired
-    public AuthenticationServiceImpl(AuthenticationManager authenticationManager,
-                           UserDetailsService userDetailsService,
-                           SysUserMapper sysUserMapper,
-                           PasswordEncoder passwordEncoder) {
-        this.authenticationManager = authenticationManager;
-        this.userDetailsService = userDetailsService;
-        this.sysUserMapper = sysUserMapper;
-        this.passwordEncoder = passwordEncoder;
-    }*/
+
 
     @Value("${jwt.tokenHead}")
     private String tokenHead;
@@ -69,8 +60,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
     @Override
     public String login(String username, String password) {
         UsernamePasswordAuthenticationToken upToken = new UsernamePasswordAuthenticationToken(username, password);
-
-        //进入到 UserDetailsService  loadUserByUsername 方法
+        /*进入到 UserDetailsService(JwtUserDetailServiceImpl)  loadUserByUsername 方法*/
         final Authentication authentication = authenticationManager.authenticate(upToken);
         SecurityContextHolder.getContext().setAuthentication(authentication);
         final UserDetails userDetails = userDetailsService.loadUserByUsername(username);

src/main/java/org/rcisoft/core/service/impl/JwtUserDetailServiceImpl.java

 package org.rcisoft.core.service.impl;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.rcisoft.core.util.JwtUserFactory;
+import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.user.dao.SysUserMapper;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,8 +10,8 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.entity.Example;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -25,17 +27,17 @@ public class JwtUserDetailServiceImpl implements UserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         //调用持久层从数据库获取用户信息
-        /*Example example = new Example(SysUser.class);
-        Example.Criteria criteria = example.createCriteria();*/
 
-        List<SysUser> sysUser = sysUserMapper.queryUserByName(username);
-        //List<SysUser> sysUser = sysUserMapper.selectByExample(example);
-        if (sysUser == null || sysUser.size() == 0)
+        List<SysUser> sysUserList = sysUserMapper.queryUserByName(username);
+
+        if (sysUserList == null || sysUserList.size() == 0)
             throw new UsernameNotFoundException("用户名不存在");
-        /*List<SysRole> roles = sysRoleRepository.findRolesByUserId(sysUser.getId());  //根据用户id或者用户权限列表
+        SysUser sysUser = sysUserList.get(0);
+        /*根据用户查询用户权限*/
+        List<SysRole> roles = sysRoleRepository.findRolesByUserId(sysUser.getBusinessId());
         if (CollectionUtils.isEmpty(roles))
             roles = Collections.emptyList();
-        sysUser.setRoles(roles);*/
-        return JwtUserFactory.create(sysUser.get(0));
+        sysUser.setRoleList(roles);
+        return JwtUserFactory.create(sysUser);
     }
 }

src/main/java/org/rcisoft/core/util/JwtUserFactory.java

@@ -26,7 +26,7 @@ public final class JwtUserFactory {
     }
 
     /**
-     * 讲User的List<Role>转换成JwtUser<GrantedAuthority>
+     * 讲User的List<SysRole>转换成JwtUser<GrantedAuthority>
 
     private static List<GrantedAuthority> map2GrantedAuthorities(List<SysRole> authorities){
         return authorities.stream()

src/main/java/org/rcisoft/sys/controller/SysController.java

-package org.rcisoft.sys.controller;
-
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.rcisoft.core.result.Result;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * Created by lcy on 17/8/13.
- */
-@RestController
-@RequestMapping(value = "sys")
-public class SysController {
-
-    /**
-     * login
-     * @param
-     * @param
-     * @return
-
-    @PostMapping(value = "/login")
-    public AjaxResponse login(String account, String pwd,AjaxResponse response){
-        Map<String,Object> map = new HashMap<String,Object>();
-        User user = null;
-        //登录成功
-        String token = JwtUtil.setClaim(account);
-        map.put("user", user);
-        map.put("token", token);
-        response.setSuccessMessage("登录成功",map);
-        return response;
-    }*/
-
-    @ApiOperation(value="获取用户详细信息", notes="根据url的id来获取用户详细信息")
-    @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "Integer", paramType = "path")
-    @GetMapping(value = "/user/{id}", produces = "application/json; charset=utf-8")
-    public Result testApi(@PathVariable(value = "id") Integer id, Result result){
-        result.setCode(400);
-        result.setData(id);
-        return result;
-    }
-}

src/main/java/org/rcisoft/sys/dept/controller/DeptController.java

@@ -12,11 +12,10 @@ import org.rcisoft.core.result.Result;
 import org.rcisoft.core.validate.ValidatedResult;
 import org.rcisoft.sys.dept.entity.Dept;
 import org.rcisoft.sys.dept.service.DeptService;
-import org.rcisoft.sys.role.entity.Role;
+import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.role.service.RoleService;
 import org.rcisoft.sys.user.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -59,8 +58,8 @@ public class DeptController extends ResponseController {
             @ApiImplicitParam(name = "code", value = "权限code", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @GetMapping("queryRolesSelect")
-    public List<Role> queryRolesSelect(Role role){
-        return roleServiceImpl.queryRolesSelect(role);
+    public List<SysRole> queryRolesSelect(SysRole sysRole){
+        return roleServiceImpl.queryRolesSelect(sysRole);
     }
     
     

src/main/java/org/rcisoft/sys/role/controller/RoleController.java

@@ -9,7 +9,7 @@ import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
 import org.rcisoft.core.validate.ValidatedResult;
-import org.rcisoft.sys.role.entity.Role;
+import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.role.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -24,7 +24,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/role")
-public class RoleController extends PaginationController<Role> {
+public class RoleController extends PaginationController<SysRole> {
 
     @Autowired
     private RoleService roleServiceImpl;
@@ -35,9 +35,9 @@ public class RoleController extends PaginationController<Role> {
              @ApiImplicitParam(name = "code", value = "权限code", required = false, dataType = "varchar"),
              @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @GetMapping(value = "queryRoleValidate")
-    public String queryRoleValidate(Role role){
-    	List<Role> roleList= roleServiceImpl.queryRolesByPagination(getPaginationUtility(),role);
-    	if(roleList.size()==0)
+    public String queryRoleValidate(SysRole sysRole){
+    	List<SysRole> sysRoleList = roleServiceImpl.queryRolesByPagination(getPaginationUtility(), sysRole);
+    	if(sysRoleList.size()==0)
     		return "true";
     	else 
     		return "false";
@@ -49,8 +49,8 @@ public class RoleController extends PaginationController<Role> {
             @ApiImplicitParam(name = "code", value = "权限code", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @GetMapping(value = "queryRoles")
-    public GridModel queryRoles(Role role){
-        roleServiceImpl.queryRolesByPagination(getPaginationUtility(),role);
+    public GridModel queryRoles(SysRole sysRole){
+        roleServiceImpl.queryRolesByPagination(getPaginationUtility(), sysRole);
         GridModel gridModel = getGridModelResponse();
         return  gridModel;
     }
@@ -63,8 +63,8 @@ public class RoleController extends PaginationController<Role> {
             @ApiImplicitParam(name = "code", value = "权限code", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @GetMapping(value = "queryRolesByUser/{userId}")
-    public GridModel queryRolesByUser(@PathVariable("userId") String userId, Role role){
-        roleServiceImpl.queryUserRolesByPagination(getPaginationUtility(),userId,role);
+    public GridModel queryRolesByUser(@PathVariable("userId") String userId, SysRole sysRole){
+        roleServiceImpl.queryUserRolesByPagination(getPaginationUtility(),userId, sysRole);
         GridModel gridModel = getGridModelResponse();
         return  gridModel;
     }
@@ -77,19 +77,19 @@ public class RoleController extends PaginationController<Role> {
             @ApiImplicitParam(name = "code", value = "权限code", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @PostMapping(value = "adminLog/roleAdd")
-    public Result roleAdd(@Valid Role role, BindingResult br){
-        PersistModel persistModel = roleServiceImpl.persistRole(role,getToken());
+    public Result roleAdd(@Valid SysRole sysRole, BindingResult br){
+        PersistModel persistModel = roleServiceImpl.persistRole(sysRole,getToken());
         if(persistModel.isSuccessBySinglePersist())
             return Result.builder(new PersistModel(1),
                     MessageConstant.MESSAGE_ALERT_SUCCESS,
                     MessageConstant.MESSAGE_ALERT_ERROR,
-                    role);
+                    sysRole);
 
         else
             return Result.builder(new PersistModel(2),
                     MessageConstant.MESSAGE_ALERT_SUCCESS,
                     MessageConstant.MESSAGE_ALERT_ERROR,
-                    role);
+                    sysRole);
     }
 
     @ApiOperation(value="to 修改用户页面", notes="to 修改用户页面")
@@ -108,7 +108,7 @@ public class RoleController extends PaginationController<Role> {
             @ApiImplicitParam(name = "code", value = "权限code", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @PostMapping(value = "adminLog/roleUpdate")
-    public Result roleUpdate(@Valid Role role, BindingResult br){
+    public Result roleUpdate(@Valid SysRole sysRole, BindingResult br){
         Result result = new Result();
         if(super.hasErrors(br)){
             ValidatedResult vr = new ValidatedResult();
@@ -119,7 +119,7 @@ public class RoleController extends PaginationController<Role> {
                     MessageConstant.MESSAGE_ALERT_INFO_INVALID,
                     vr);
         }
-        PersistModel persistModel = roleServiceImpl.mergeRole(role,getToken());
+        PersistModel persistModel = roleServiceImpl.mergeRole(sysRole,getToken());
         return Result.builder(persistModel,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,

src/main/java/org/rcisoft/sys/role/dao/RoleRepository.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.sys.dept.entity.DeptRole;
-import org.rcisoft.sys.role.entity.Role;
+import org.rcisoft.sys.role.entity.SysRole;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -20,10 +20,10 @@ import java.util.Map;
  * description:
  */
 @Repository
-public interface RoleRepository extends BaseMapper<Role> {
+public interface RoleRepository extends BaseMapper<SysRole> {
     /**
      * 分页查询 roles
-     * @param role
+     * @param sysRole
      * @return
      */
     @Select("<script>select sys_role.*,sys_user.NAME as username from sys_role  LEFT JOIN sys_user ON sys_role.CREATE_BY=sys_user.BUSINESS_ID where "
@@ -32,14 +32,14 @@ public interface RoleRepository extends BaseMapper<Role> {
     		//+ "<if test=\"phone !=null \">phone = #{phone} </if> <if test=\"usermail !=null \">usermail = #{usermail } </if>"
     		+ "</script>")
     @ResultMap(value = "BaseResultMap" )
-    List<Role> queryRoles(Role role);
+    List<SysRole> queryRoles(SysRole sysRole);
     
     
     @Select("<script>select * from sys_role  where "
     		+ "DEL_FLAG='0' "
     		+ "</script>")
     @ResultMap(value = "BaseResultMap" )
-    List<Role> queryRolesSelect(Role role);
+    List<SysRole> queryRolesSelect(SysRole sysRole);
 
     /**
      * 根据角色id  删除对应权限
@@ -74,7 +74,7 @@ public interface RoleRepository extends BaseMapper<Role> {
     int insertBatchRoleDept(List<Map> deptRole);
     /**
      * 分页查询 roles
-     * @param role
+     * @param sysRole
      * @return
      */
     @Select(" <script>select "
@@ -87,23 +87,23 @@ public interface RoleRepository extends BaseMapper<Role> {
     		+ " LEFT JOIN sys_dept d ON d.BUSINESS_ID = dr.DEPT_ID "
     		+ " LEFT JOIN sys_role r on dr.ROLE_ID = r.BUSINESS_ID</script>")
     @ResultMap(value = "drResultMap" )
-    List<DeptRole> queryUserRolesByPagination(@Param("userId") String userId, Role role) ;
+    List<DeptRole> queryUserRolesByPagination(@Param("userId") String userId, SysRole sysRole) ;
     
     
     /**
      * 分页查询 roles
-     * @param role
+     * @param sysRole
      * @return
      */
     @Select("<script>SELECT " +
-            " role.BUSINESS_ID, " +
-            " role.NAME, " +
-            " role.CODE, " +
-            " role.DATA_SCOPE, " +
-            " role.FLAG, " +
-            " role.DEL_FLAG, " +
-            " role.CREATE_BY, " +
-            " role.create_date, " +
+            " sysRole.BUSINESS_ID, " +
+            " sysRole.NAME, " +
+            " sysRole.CODE, " +
+            " sysRole.DATA_SCOPE, " +
+            " sysRole.FLAG, " +
+            " sysRole.DEL_FLAG, " +
+            " sysRole.CREATE_BY, " +
+            " sysRole.create_date, " +
             "IF ( " +
             " ( " +
             "  SELECT " +
@@ -111,18 +111,18 @@ public interface RoleRepository extends BaseMapper<Role> {
             "  FROM " +
             "   SYS_DEPT_ROLE dr " +
             "  WHERE " +
-            "   dr.ROLE_ID = role.BUSINESS_ID " +
+            "   dr.ROLE_ID = sysRole.BUSINESS_ID " +
             "  AND ur.USER_ID = #{deptId}  " +
             " ) > 0, " +
             "  '1', " +
             "  '0' " +
             " ) AS checked " +
             "FROM " +
-            " sys_role role " +
+            " sys_role sysRole " +
             "WHERE " +
             " DEL_FLAG = '0' and FLAG = '1'</script>")
     @ResultMap(value = "BaseResultMap" )
-    List<Role> queryDeptRolesByPagination(@Param("deptId") String deptId, Role role);
+    List<SysRole> queryDeptRolesByPagination(@Param("deptId") String deptId, SysRole sysRole);
      
     @Delete("<script>DELETE from sys_dept_role_user where DEPT_ROLE_ID="
     		+ "("

src/main/java/org/rcisoft/sys/role/entity/Role.java → src/main/java/org/rcisoft/sys/role/entity/SysRole.java

@@ -25,7 +25,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class Role extends IdEntity<Role> {
+public class SysRole extends IdEntity<SysRole> {
 
 
     private static final long serialVersionUID = -437438239495993636L;
@@ -40,14 +40,14 @@ public class Role extends IdEntity<Role> {
 	/*权限code*/
     private String code;
 
+    @Transient
     private String checked;
 
-    private String dataScope;
 
     @Transient
     private List<Menu> menuList = Lists.newArrayList(); // 拥有菜单列表
 
-    public Role(String id, String name) {
+    public SysRole(String id, String name) {
         this();
         this.businessId = id;
         this.name = name;
@@ -69,6 +69,7 @@ public class Role extends IdEntity<Role> {
      * 获取权限字符串列表
      */
     @Transient
+    @JsonIgnore
     public List<String> getPermissions() {
         List<String> permissions = Lists.newArrayList();
         for (Menu menu : menuList) {

src/main/java/org/rcisoft/sys/role/service/RoleService.java

@@ -5,7 +5,7 @@ package org.rcisoft.sys.role.service;
 import org.rcisoft.common.component.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.dept.entity.DeptRole;
-import org.rcisoft.sys.role.entity.Role;
+import org.rcisoft.sys.role.entity.SysRole;
 
 import java.util.List;
 
@@ -16,17 +16,17 @@ public interface RoleService {
 
     /**
      * 保存
-     * @param role
+     * @param sysRole
      * @return
      */
-    PersistModel persistRole(Role role,String token);
+    PersistModel persistRole(SysRole sysRole, String token);
 
     /**
      * 修改
-     * @param role
+     * @param sysRole
      * @return
      */
-    PersistModel mergeRole(Role role, String token);
+    PersistModel mergeRole(SysRole sysRole, String token);
 
     /**
      * 删除
@@ -38,17 +38,17 @@ public interface RoleService {
     /**
      * getByid
      */
-    Role queryRoleById(String id);
+    SysRole queryRoleById(String id);
     /**
      * 分页查询角色
      * @param paginationUtility
-     * @param role
+     * @param sysRole
      * @return
      */
-    public List<Role> queryRolesByPagination(PageUtil<Role> paginationUtility, Role role);
+    public List<SysRole> queryRolesByPagination(PageUtil<SysRole> paginationUtility, SysRole sysRole);
     
     //select 
-    List<Role> queryRolesSelect(Role role);
+    List<SysRole> queryRolesSelect(SysRole sysRole);
 
     /**
      * 授权(赋予角色 权限)
@@ -63,17 +63,17 @@ public interface RoleService {
      * 分页查询角色   根据 userId   进行checked
      * @param paginationUtility
      * @param userId
-     * @param role
+     * @param sysRole
      * @return
      */
-    public List<DeptRole> queryUserRolesByPagination(PageUtil<Role> paginationUtility, String userId, Role role);
+    public List<DeptRole> queryUserRolesByPagination(PageUtil<SysRole> paginationUtility, String userId, SysRole sysRole);
 
     /**
      *
      * @param paginationUtility
      * @param DeptId
-     * @param role
+     * @param sysRole
      * @return
      */
-    public List<Role> queryDeptRolesByPagination(PageUtil<Role> paginationUtility, String DeptId, Role role);
+    public List<SysRole> queryDeptRolesByPagination(PageUtil<SysRole> paginationUtility, String DeptId, SysRole sysRole);
 }

src/main/java/org/rcisoft/sys/role/service/impl/RoleServiceImpl.java

@@ -9,7 +9,7 @@ import org.rcisoft.core.util.IdGen;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.sys.dept.entity.DeptRole;
 import org.rcisoft.sys.role.dao.RoleRepository;
-import org.rcisoft.sys.role.entity.Role;
+import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.role.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,22 +36,22 @@ public class RoleServiceImpl  implements RoleService {
 
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
-    public PersistModel persistRole(Role role, String token) {
-    	role.setCommonBusinessId();
+    public PersistModel persistRole(SysRole sysRole, String token) {
+    	sysRole.setCommonBusinessId();
         //增加操作
-        UserUtil.setCurrentPersistOperation(role,token);
-        int line = roleRepository.insertSelective(role);
-        log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"新增了ID为"+role.getBusinessId()+"的角色信息");
+        UserUtil.setCurrentPersistOperation(sysRole,token);
+        int line = roleRepository.insertSelective(sysRole);
+        log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"新增了ID为"+ sysRole.getBusinessId()+"的角色信息");
         return new PersistModel(line);
     }
 
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
-    public PersistModel mergeRole(Role role,String token) {
+    public PersistModel mergeRole(SysRole sysRole, String token) {
         //修改操作
-        UserUtil.setCurrentMergeOperation(role,token);
-        int line = roleRepository.updateByPrimaryKeySelective(role);
-        log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"修改了ID为"+role.getBusinessId()+"的角色信息");
+        UserUtil.setCurrentMergeOperation(sysRole,token);
+        int line = roleRepository.updateByPrimaryKeySelective(sysRole);
+        log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"修改了ID为"+ sysRole.getBusinessId()+"的角色信息");
         return new PersistModel(line);
     }
 
@@ -64,21 +64,21 @@ public class RoleServiceImpl  implements RoleService {
         line = roleRepository.deleteDeptRoleByRoleId(id);
         line = roleRepository.deleteRoleMenuByRoleId(id);
 
-        Role role = roleRepository.selectByPrimaryKey(id);
-        role.setDelFlag(DelStatus.DELETED.getStatus());
-        UserUtil.setCurrentMergeOperation(role,token);
-    	line = roleRepository.updateByPrimaryKeySelective(role);
-        log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"删除了ID为"+role.getBusinessId()+"的角色信息");
+        SysRole sysRole = roleRepository.selectByPrimaryKey(id);
+        sysRole.setDelFlag(DelStatus.DELETED.getStatus());
+        UserUtil.setCurrentMergeOperation(sysRole,token);
+    	line = roleRepository.updateByPrimaryKeySelective(sysRole);
+        log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"删除了ID为"+ sysRole.getBusinessId()+"的角色信息");
         return new PersistModel(line);
     }
 
     @Override
-    public List<Role> queryRolesByPagination(PageUtil<Role> paginationUtility, Role role) {
-        return roleRepository.queryRoles(role);
+    public List<SysRole> queryRolesByPagination(PageUtil<SysRole> paginationUtility, SysRole sysRole) {
+        return roleRepository.queryRoles(sysRole);
     }
     @Override
-    public List<DeptRole> queryUserRolesByPagination(PageUtil<Role> paginationUtility, String userId, Role role) {
-        return roleRepository.queryUserRolesByPagination(userId,role);
+    public List<DeptRole> queryUserRolesByPagination(PageUtil<SysRole> paginationUtility, String userId, SysRole sysRole) {
+        return roleRepository.queryUserRolesByPagination(userId, sysRole);
     }
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
@@ -104,8 +104,8 @@ public class RoleServiceImpl  implements RoleService {
     }
     
     @Override
-    public List<Role> queryDeptRolesByPagination(PageUtil<Role> paginationUtility, String deptId, Role role) {
-        return roleRepository.queryDeptRolesByPagination(deptId,role);
+    public List<SysRole> queryDeptRolesByPagination(PageUtil<SysRole> paginationUtility, String deptId, SysRole sysRole) {
+        return roleRepository.queryDeptRolesByPagination(deptId, sysRole);
     }
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
@@ -131,13 +131,13 @@ public class RoleServiceImpl  implements RoleService {
     }
 
 	@Override
-	public Role queryRoleById(String id) {
+	public SysRole queryRoleById(String id) {
 	       return roleRepository.selectByPrimaryKey(id);
 	}
 
 	@Override
-	public List<Role> queryRolesSelect(Role role) {
-		return roleRepository.queryRolesSelect(role);
+	public List<SysRole> queryRolesSelect(SysRole sysRole) {
+		return roleRepository.queryRolesSelect(sysRole);
 	}
 
 

src/main/java/org/rcisoft/sys/user/entity/SysUser.java

 package org.rcisoft.sys.user.entity;
 
+import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.rcisoft.core.entity.IdEntity;
+import org.rcisoft.sys.role.entity.SysRole;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * Created by lcy on 17/11/21.
@@ -29,4 +33,8 @@ public class SysUser extends IdEntity<SysUser> {
     private String name;
 
 
+
+    @Transient
+    private List<SysRole> roleList = Lists.newArrayList(); // 拥有角色列表
+
 }

src/main/resources/mapper/sys/role/mapper/roleMapper.xml

 <?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="org.rcisoft.sys.role.dao.RoleRepository">
+<mapper namespace="org.rcisoft.sys.sysRole.dao.RoleRepository">
 
-  <resultMap id="BaseResultMap"  type="org.rcisoft.sys.role.entity.Role">
+  <resultMap id="BaseResultMap"  type="org.rcisoft.sys.sysRole.entity.SysRole">
     <id column="business_id" jdbcType="VARCHAR" property="businessId" />
 
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="DATA_SCOPE" jdbcType="VARCHAR" property="dataScope" />
     <result column="CODE" jdbcType="VARCHAR" property="code" />
     <result column="checked" jdbcType="VARCHAR" property="checked" />
 
@@ -31,7 +30,7 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    BUSINESS_ID,name,DATA_SCOPE,CODE,CREATE_BY,FLAG,UPDATE_BY,DEL_FLAG,update_date,create_date
+    BUSINESS_ID,name,CODE,CREATE_BY,FLAG,UPDATE_BY,DEL_FLAG,update_date,create_date
   </sql>
 
   <!--insertBatchRoleMenu 批量插入角色权限-->