Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 c93fc713fedb68cc96f6f29e0442d949b44b7caa

 src/main/java/com/ruoyi/project/system/controller/SysPostController.java

@@ -1,7 +1,8 @@
package com.ruoyi.project.system.controller;



import java.util.List;

import javax.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpServletResponse;

import lombok.AllArgsConstructor;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.validation.annotation.Validated;

@@ -13,7 +14,6 @@
import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

@@ -30,9 +30,9 @@
 */

@RestController

@RequestMapping("/system/post")

@AllArgsConstructor

public class SysPostController extends BaseController

{

    @Autowired

    private ISysPostService postService;



    /**

@@ -46,6 +46,9 @@
        List<SysPost> list = postService.selectPostList(post);

        return getDataTable(list);

    }

    /**

     * 导出岗位列表

     */

    

    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)

    @PreAuthorize("@ss.hasPermi('system:post:export')")

@@ -75,11 +78,11 @@
    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysPost post)

    {

        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))

        if (!postService.checkPostNameUnique(post))

        {

            return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");

        }

        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))

        else if (!postService.checkPostCodeUnique(post))

        {

            return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");

        }

@@ -95,11 +98,11 @@
    @PutMapping

    public AjaxResult edit(@Validated @RequestBody SysPost post)

    {

        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))

        if (!postService.checkPostNameUnique(post))

        {

            return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");

        }

        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))

        else if (!postService.checkPostCodeUnique(post))

        {

            return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");

        }