java/qijisheng.git

			@@ -11,6 +11,7 @@
			import com.ruoyi.common.datascope.annotation.DataScope;
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.common.security.utils.SecurityUtils;
			import com.ruoyi.system.api.domain.SysDept;
			import com.ruoyi.system.api.domain.SysRole;
			import com.ruoyi.system.api.domain.SysUser;
			import com.ruoyi.system.api.query.ChangeUserQuery;
			@@ -19,12 +20,10 @@
			import com.ruoyi.system.domain.SysUserRole;
			import com.ruoyi.system.mapper.*;
			import com.ruoyi.system.query.GetSysUserList;
			import com.ruoyi.system.service.ISysConfigService;
			import com.ruoyi.system.service.ISysRoleService;
			import com.ruoyi.system.service.ISysUserRoleService;
			import com.ruoyi.system.service.ISysUserService;
			import com.ruoyi.system.service.*;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.context.annotation.Lazy;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;
			@@ -75,6 +74,10 @@

			@Resource
			private TokenService tokenService;

			@Lazy
			@Resource
			private ISysDeptService deptService;


			/**
			@@ -520,11 +523,16 @@
			List<String> roleNames = new ArrayList<>();
			for (SysUserRole sysUserRole : list1) {
			SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId());
			if(null == sysRole){
			continue;
			}
			roleNames.add(sysRole.getRoleName());
			}
			Long[] roleIds = new Long[]{};
			sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds));
			sysUser.setRoleNames(roleNames);
			SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
			sysUser.setDept(sysDept);
			}
			return pageInfo.setRecords(list);
			}