教育培训任务代码提交

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -19,6 +19,7 @@ import com.xunmei.system.api.domain.SysUserInformation;
 import com.xunmei.system.api.model.LoginUser;
 import com.xunmei.system.domain.SysUserRole;
 import com.xunmei.system.domain.vo.SysUserListVo;
+import com.xunmei.system.domain.vo.UserRoleVo;
 import com.xunmei.system.service.*;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
@@ -139,10 +140,12 @@ public class SysUserController extends BaseController {
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-        List<SysUserRole> sysUserRoles = sysUserRoleService.selectSysUserRoleListByUserId(user.getId());
+        List<UserRoleVo> userRoleVos = sysUserRoleService.selectUserRoleVoList(user.getId());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
+        //用户角色信息
+        ajax.put("roleList", userRoleVos);
         ajax.put("permissions", permissions);
         return ajax;
     }