Merge remote-tracking branch 'origin/dev_tide_cbsglxt' into dev_tide_cbsglx...

zouyu

2 天以前 02f6d9e4d4f18060c41a7ea891c4c20adf92f335

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

@@ -2,6 +2,8 @@


import java.util.List;

import javax.servlet.http.HttpServletResponse;



import com.ruoyi.common.utils.SecurityUtils;

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

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

import org.springframework.validation.annotation.Validated;

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

        return getDataTable(list);

    }

    /**

     * 导出岗位列表

     */

    

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

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

@@ -83,6 +88,7 @@
            return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");

        }

        post.setCreateBy(getUsername());

        post.setTenantId(SecurityUtils.getLoginUser().getTenantId());

        return toAjax(postService.insertPost(post));

    }