Merge remote-tracking branch 'origin/dev' into test

yun-zuoyi
汪云昊 5 years ago
commit a0d92c5c6c

@ -388,8 +388,9 @@ public class SysUserInfoController extends CoreBaseController{
UserExportModel userExportModel; UserExportModel userExportModel;
List<SysRefUserRole> sysRefUserRoleList; List<SysRefUserRole> sysRefUserRoleList;
StringBuilder roleName = new StringBuilder(); StringBuilder roleName;
for (SysUserInfo userInfoItem : list) { for (SysUserInfo userInfoItem : list) {
roleName = new StringBuilder();
// 关联角色信息 // 关联角色信息
sysRefUserRoleList = sysUserService.findSysRefUserRoleByUserId(userInfoItem.getUserId()); sysRefUserRoleList = sysUserService.findSysRefUserRoleByUserId(userInfoItem.getUserId());
for (SysRefUserRole sysRefUserRole : sysRefUserRoleList) { for (SysRefUserRole sysRefUserRole : sysRefUserRoleList) {

Loading…
Cancel
Save