From 9748e10339f81073e4fefe8516c1a03312a25d05 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 07 十二月 2022 11:41:44 +0800
Subject: [PATCH] 升级druid到最新版本1.2.15
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
index 30a8761..6a206cc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system;
import java.util.List;
+import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -48,12 +49,12 @@
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:post:export')")
- @GetMapping("/export")
- public AjaxResult export(SysPost post)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysPost post)
{
List<SysPost> list = postService.selectPostList(post);
ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
- return util.exportExcel(list, "岗位数据");
+ util.exportExcel(response, list, "岗位数据");
}
/**
@@ -63,7 +64,7 @@
@GetMapping(value = "/{postId}")
public AjaxResult getInfo(@PathVariable Long postId)
{
- return AjaxResult.success(postService.selectPostById(postId));
+ return success(postService.selectPostById(postId));
}
/**
@@ -76,11 +77,11 @@
{
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
{
- return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+ return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
}
else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
{
- return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+ return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
}
post.setCreateBy(getUsername());
return toAjax(postService.insertPost(post));
@@ -96,11 +97,11 @@
{
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
{
- return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+ return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
}
else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
{
- return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+ return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
}
post.setUpdateBy(getUsername());
return toAjax(postService.updatePost(post));
@@ -124,6 +125,6 @@
public AjaxResult optionselect()
{
List<SysPost> posts = postService.selectPostAll();
- return AjaxResult.success(posts);
+ return success(posts);
}
}
--
Gitblit v1.9.2