java/YiFeiNN.git

			@@ -21,6 +21,7 @@
			import com.sinata.system.domain.SysDepartment;
			import com.sinata.system.domain.SysUserRole;
			import com.sinata.system.domain.dto.UserInfoDTO;
			import com.sinata.system.enums.DepartmentEnum;
			import com.sinata.system.mapper.SysUserRoleMapper;
			import com.sinata.system.service.ISysMenuService;
			import com.sinata.system.service.ISysRoleService;
			@@ -41,6 +42,7 @@
			import javax.annotation.Resource;
			import java.util.List;
			import java.util.Map;
			import java.util.Objects;
			import java.util.Random;
			import java.util.Set;

			@@ -230,6 +232,16 @@
			userInfoDTO.setNickName(user.getNickName());
			userInfoDTO.setDepartment(byId2);
			userInfoDTO.setRoles(roles);
			if (byId2.getOrgType().equals(DepartmentEnum.REGULATORY_UNIT.getCode())) {
			SysDepartment department = departmentService.getById(byId2.getParentId());
			if (Objects.nonNull(department)) {
			userInfoDTO.setCurrentDepartmentId(department.getId());
			userInfoDTO.setCurrentDepartmentName(department.getDepartmentName());
			}
			} else {
			userInfoDTO.setCurrentDepartmentId(byId2.getId());
			userInfoDTO.setCurrentDepartmentName(byId2.getDepartmentName());
			}
			SysUserRole sysUserRole = sysUserRoleMapper.selectOne(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, user.getUserId()));
			if (sysUserRole != null) {
			SysRole byId = roleService.getById(sysUserRole.getRoleId());