|
@@ -1,5 +1,6 @@
|
|
|
package com.ozs.web.controller.system;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.ozs.common.annotation.Log;
|
|
|
import com.ozs.common.constant.UserConstants;
|
|
@@ -36,6 +37,7 @@ import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.InputStream;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -117,6 +119,11 @@ public class SysUserController extends BaseController {
|
|
|
longs = iSysRoleService.selectRoleListByUserId(o.getId());
|
|
|
}
|
|
|
Long[] objects = longs.toArray(new Long[]{});
|
|
|
+ QueryWrapper<SysRole> wrapper=new QueryWrapper<>();
|
|
|
+ wrapper.in("role_id", Arrays.asList(objects));
|
|
|
+ List<SysRole> roles = roleService.list(wrapper);
|
|
|
+ List<String> collect = roles.stream().map(SysRole::getRoleName).collect(Collectors.toList());
|
|
|
+ o.setRoleNames(collect);
|
|
|
o.setRoleIds(objects);
|
|
|
return o;
|
|
|
}).collect(Collectors.toList());
|