EmergencyRepair.git

			@@ -14,6 +14,7 @@
			import com.emergencyrepair.business.mapper.TeamMajorMapper;
			import com.emergencyrepair.common.BusinessException;
			import com.emergencyrepair.system.entity.SysMenu;
			import com.emergencyrepair.system.entity.SysErrorLog;
			import com.emergencyrepair.system.entity.SysLoginLog;
			import com.emergencyrepair.system.entity.SysOperationLog;
			import com.emergencyrepair.system.entity.SysRole;
			@@ -21,6 +22,7 @@
			import com.emergencyrepair.system.entity.SysRoleUser;
			import com.emergencyrepair.system.entity.SysTenantMenu;
			import com.emergencyrepair.system.mapper.SysMenuMapper;
			import com.emergencyrepair.system.mapper.SysErrorLogMapper;
			import com.emergencyrepair.system.mapper.SysLoginLogMapper;
			import com.emergencyrepair.system.mapper.SysOperationLogMapper;
			import com.emergencyrepair.system.mapper.SysRoleMapper;
			@@ -59,6 +61,7 @@
			private final SysRoleUserMapper roleUserMapper;
			private final SysLoginLogMapper loginLogMapper;
			private final SysOperationLogMapper operationLogMapper;
			private final SysErrorLogMapper errorLogMapper;
			private final ButtonPermissionCatalog buttonPermissionCatalog;
			private final JdbcTemplate jdbcTemplate;
			private final EngineeringMajorMapper engineeringMajorMapper;
			@@ -887,9 +890,10 @@
			}
			}
			final Set<Long> allowedIds = allowed;
			Set<Long> visibleIds = new LinkedHashSet<>(expandWithAncestors(new ArrayList<>(allowed)));
			List<SysMenu> navigable = listMenus().stream()
			.filter(menu -> menu.getMenuType() == null \|\| menu.getMenuType() != 2)
			.filter(menu -> allowedIds.contains(menu.getId()))
			.filter(menu -> visibleIds.contains(menu.getId()))
			.collect(Collectors.toList());
			return buildTree(navigable);
			}
			@@ -1038,6 +1042,47 @@
			return operationLogMapper.selectPage(page, wrapper);
			}

			public Page<SysErrorLog> errorLogPage(int current, int size, String keyword, String module, String exceptionType, String startDate, String endDate) {
			Page<SysErrorLog> page = new Page<>(current <= 0 ? 1 : current, size <= 0 ? 20 : size);
			LambdaQueryWrapper<SysErrorLog> wrapper = Wrappers.lambdaQuery();
			wrapper.select(SysErrorLog::getId, SysErrorLog::getUserId, SysErrorLog::getUserName,
			SysErrorLog::getNickName, SysErrorLog::getModule, SysErrorLog::getRequestMethod,
			SysErrorLog::getRequestUri, SysErrorLog::getExceptionType, SysErrorLog::getMessage,
			SysErrorLog::getErrorTime);
			if (StringUtils.hasText(keyword)) {
			String value = keyword.trim();
			wrapper.and(item -> item.like(SysErrorLog::getUserName, value)
			.or().like(SysErrorLog::getNickName, value)
			.or().like(SysErrorLog::getRequestUri, value)
			.or().like(SysErrorLog::getExceptionType, value)
			.or().like(SysErrorLog::getMessage, value));
			}
			if (StringUtils.hasText(module)) {
			wrapper.eq(SysErrorLog::getModule, module.trim());
			}
			if (StringUtils.hasText(exceptionType)) {
			wrapper.like(SysErrorLog::getExceptionType, exceptionType.trim());
			}
			LocalDateTime start = parseStart(startDate);
			LocalDateTime end = parseEnd(endDate);
			if (start != null) {
			wrapper.ge(SysErrorLog::getErrorTime, start);
			}
			if (end != null) {
			wrapper.le(SysErrorLog::getErrorTime, end);
			}
			wrapper.orderByDesc(SysErrorLog::getErrorTime);
			return errorLogMapper.selectPage(page, wrapper);
			}

			public SysErrorLog errorLog(Long id) {
			SysErrorLog log = errorLogMapper.selectById(id);
			if (log == null) {
			throw new BusinessException("错误日志不存在");
			}
			return log;
			}

			public Long resolveUserId(String username) {
			if (!StringUtils.hasText(username)) {
			return null;