From 291a72bf35e2d39b816abc0ebf085cfa9da3ee06 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期二, 23 九月 2025 14:11:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java index e6339f8..16acef2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java @@ -1,28 +1,19 @@ package com.ruoyi.web.controller.api; -import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.entity.TDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.dto.AddDeptDTO; import com.ruoyi.system.dto.SetDeptDTO; -import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.model.OaApproval; import com.ruoyi.system.query.ApprovalListQuery; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.query.ApprovalNodeListQuery; import com.ruoyi.system.service.OaApprovalService; -import com.ruoyi.system.service.TDeptService; import com.ruoyi.system.vo.system.ApprovalVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; /** * <p> -- Gitblit v1.7.1