From 9d9f582738123dbbfc6a7b91bb16ff4e4bf9f8f2 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Tue, 10 Feb 2026 13:51:13 +0800
Subject: [PATCH] 恢复日志展示
---
multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java
index 868f6b3..6a59f37 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java
@@ -1,12 +1,12 @@
package com.gkhy.exam.admin.controller.system;
-import cn.hutool.core.util.ObjectUtil;
import com.gkhy.exam.common.api.CommonResult;
-import com.gkhy.exam.common.constant.UserConstant;
import com.gkhy.exam.common.domain.TreeSelect;
import com.gkhy.exam.common.domain.entity.SysDept;
import com.gkhy.exam.system.domain.SysFunctionalDistribution;
+import com.gkhy.exam.system.domain.SysFunctionalRemark;
+import com.gkhy.exam.system.domain.req.SysDeptPageReq;
import com.gkhy.exam.system.domain.vo.DeptVo;
import com.gkhy.exam.system.domain.vo.FunctionalDistributionVo;
import com.gkhy.exam.system.domain.vo.SysDeptResponsibilityReqVo;
@@ -16,16 +16,11 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-
-import static com.gkhy.exam.common.utils.SecurityUtils.getUsername;
/**
* 部门信息
@@ -48,21 +43,29 @@
// @PreAuthorize("hasAnyAuthority('system:dept:list')")
@GetMapping("/list")
@ApiOperation(value = "获取部门列表")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
- @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"),
- })
public CommonResult list(SysDept dept)
{
List<DeptVo> depts = deptService.selectDeptList(dept);
return CommonResult.success(depts);
}
- @GetMapping("/pageList")
- @ApiOperation(value = "获取部门列表分页")
- public CommonResult pageList(SysDept dept)
+ @GetMapping("/getOutDeptList")
+ @ApiOperation(value = "获取部门列表简化版本")
+ public CommonResult getOutDeptList(SysDept dept)
{
+ List<SysDept> outDeptList = deptService.getOutDeptList(dept);
+ return CommonResult.success(outDeptList);
+ }
+
+ @GetMapping("/pageList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"),
+ @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"),
+ })
+ @ApiOperation(value = "获取部门列表分页")
+ public CommonResult pageList(SysDeptPageReq dept)
+ {
return CommonResult.success(deptService.selectDeptPageList(dept));
}
@@ -72,7 +75,7 @@
@ApiOperation(value = "获取部门列表树状")
public CommonResult treeList(SysDept dept)
{
- List<SysDept> treeSelects = deptService.selectDeptTreeList(dept);
+ List<TreeSelect> treeSelects = deptService.selectDeptTreeList(dept);
return CommonResult.success(treeSelects);
}
@@ -137,6 +140,18 @@
return CommonResult.success(functionalDistributionList);
}
+ @GetMapping("/functionalRemarkList")
+ @ApiOperation(value = "职能分配备注数据")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "companyId", dataType = "Long", required = true, value = "公司id"),
+ })
+ public CommonResult functionalRemarkList(@RequestParam Long companyId)
+ {
+ List<SysFunctionalRemark> functionalRemarkList = deptService.getFunctionalRemarkList(companyId);
+
+ return CommonResult.success(functionalRemarkList);
+ }
+
@PostMapping("/saveFunctionalDistribution")
@ApiOperation(value = "保存职能分配")
--
Gitblit v1.9.2