diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysPost.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysPost.java index 4a715d7..dff2bcf 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysPost.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysPost.java @@ -35,6 +35,9 @@ public class SysPost extends BaseEntity @Excel(name = "岗位名称") private String postName; + /** 所属公司ID */ + private Long companyId; + /** 岗位排序 */ @Excel(name = "岗位排序") private Integer postSort; @@ -80,6 +83,14 @@ public class SysPost extends BaseEntity this.postName = postName; } + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + @NotNull(message = "显示顺序不能为空") public Integer getPostSort() { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysPostController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysPostController.java index 100ebb8..bfd3c68 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysPostController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysPostController.java @@ -8,6 +8,7 @@ import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.InnerAuth; import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; +import com.bonus.config.SystemConfig; import com.bonus.system.api.domain.SysPost; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +41,9 @@ public class SysPostController extends BaseController { @Autowired private ISysPostService postService; + @Autowired + SystemConfig systemConfig; + /** * 获取岗位列表 */ @@ -92,6 +96,8 @@ public class SysPostController extends BaseController { @SysLog(title = "岗位管理", businessType = OperaType.INSERT, logType = 0, module = "系统管理->岗位管理", details = "新增岗位") public AjaxResult add(@Validated @RequestBody SysPost post) { try { + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + post.setCompanyId(companyId); if (!postService.checkPostNameUnique(post)) { return error("新增岗位'" + post.getPostName() + "'失败,岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysPostMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysPostMapper.java index b56a4ad..ef966a8 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysPostMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysPostMapper.java @@ -24,7 +24,7 @@ public interface SysPostMapper * * @return 岗位列表 */ - public List selectPostAll(); + public List selectPostAll(SysPost sysPost); /** * 通过岗位ID查询岗位信息 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysPostServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysPostServiceImpl.java index 03dcd5b..707e841 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysPostServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysPostServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.system.service.impl; import java.util.List; +import com.bonus.common.security.utils.SecurityUtils; import com.bonus.system.api.domain.SysPost; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,7 +44,7 @@ public class SysPostServiceImpl implements ISysPostService String str = post.getPostName().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_"); post.setPostName(str); } - + post.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return postMapper.selectPostList(post); } @@ -55,7 +56,9 @@ public class SysPostServiceImpl implements ISysPostService @Override public List selectPostAll() { - return postMapper.selectPostAll(); + SysPost sysPost = new SysPost(); + sysPost.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + return postMapper.selectPostAll(sysPost); } /** diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysPostMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysPostMapper.xml index 2171da9..c8bfbed 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -18,13 +19,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark + select post_id, post_code, post_name, post_sort, company_id, status, create_by, create_time, remark from sys_post - + where 1=1 + + AND company_id = #{companyId} + - where post_name=#{postName} limit 1 + where post_name=#{postName} + + AND company_id = #{companyId} + + limit 1 @@ -79,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" post_code = #{postCode}, post_name = #{postName}, post_sort = #{postSort}, + company_id = #{companyId}, status = #{status}, remark = #{remark}, update_by = #{updateBy}, @@ -93,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" post_code, post_name, post_sort, + company_id, status, remark, create_by, @@ -102,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{postCode}, #{postName}, #{postSort}, + #{companyId}, #{status}, #{remark}, #{createBy},