岗位bug

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostAssessmentRulesController.java

@@ -195,8 +195,7 @@ public class PostAssessmentRulesController extends BaseController
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
-        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
-        if (sysPost.getPostLevel() != 1) {
+        if (!sysPostService.userHaveAuthority(loginUser.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 
@@ -227,8 +226,7 @@ public class PostAssessmentRulesController extends BaseController
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
-        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
-        if (sysPost.getPostLevel() != 1) {
+        if (!sysPostService.userHaveAuthority(loginUser.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 
@@ -258,11 +256,9 @@ public class PostAssessmentRulesController extends BaseController
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
-        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
-        if (sysPost.getPostLevel() != 1) {
+        if (!sysPostService.userHaveAuthority(loginUser.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
-
         return toAjax(postAssessmentRulesService.statusApprove(id, status,  statusReason));
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedReportController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.DeptCode;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.domain.UserPostAuthority;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -240,8 +241,7 @@ public class PostCheckedReportController extends BaseController
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
-        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
-        if (sysPost.getPostLevel() != 1) {
+        if (!sysPostService.userHaveAuthority(sysDept.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         return toAjax(postCheckedReportService.statusApprove(id, status,  statusReason));

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostPlanController.java

@@ -237,8 +237,7 @@ public class PostPlanController extends BaseController {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
-        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
-        if (sysPost.getPostLevel() != 1) {
+        if (!sysPostService.userHaveAuthority(loginUser.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 
@@ -281,8 +280,7 @@ public class PostPlanController extends BaseController {
         }
 
         // 判断岗位是否在权限范围内
-        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
-        if (sysPost.getPostLevel() != 1) {
+        if (!sysPostService.userHaveAuthority(loginUser.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
 

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostProgrammeController.java

@@ -222,10 +222,7 @@ public class PostProgrammeController extends BaseController {
         if (!sysDept.getDeptCode().equals(DeptCode.DEPT_HR.getCode())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
-
-        // 判断岗位是否在权限范围内
-        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
-        if (sysPost.getPostLevel() != 1) {
+        if (!sysPostService.userHaveAuthority(loginUser.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         return toAjax(postProgrammeService.approveHr(id, statusHr, reasonHr));
@@ -264,8 +261,7 @@ public class PostProgrammeController extends BaseController {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         // 判断岗位是否在权限范围内
-        SysPost sysPost = sysPostService.selectPostByDeptId(loginUser.getDeptId());
-        if (sysPost.getPostLevel() != 1) {
+        if (!sysPostService.userHaveAuthority(loginUser.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
         return toAjax(postProgrammeService.approveIcfa(id, statusIcfa, reasonIcfa));

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

@@ -99,13 +99,5 @@ public interface SysPostMapper {
      */
     public SysPost checkPostCodeUnique(String postCode);
 
-    /**
-     * 根据部门查询岗位
-     *
-     * @param deptId
-     * @return
-     */
-    public SysPost selectPostByDeptId(Long deptId);
-
     List<UserPostAuthority> userPostAuthorityList(@Param("deptId") Long deptId, @Param("postLevel") Integer postLevel);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -99,12 +99,6 @@ public interface ISysPostService
      */
     public int updatePost(SysPost post);
 
-    /**
-     * 根据部门查询岗位
-     * @param deptId
-     * @return
-     */
-    public SysPost selectPostByDeptId(Long deptId);
 
     /**
      * 查询部门经理级别岗位下的人员列表

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -168,16 +168,6 @@ public class SysPostServiceImpl implements ISysPostService {
         return postMapper.updatePost(post);
     }
 
-    /**
-     * 根据部门查询岗位
-     *
-     * @param deptId
-     * @return
-     */
-    @Override
-    public SysPost selectPostByDeptId(Long deptId) {
-        return postMapper.selectPostByDeptId(deptId);
-    }
 
     /**
      * 查询部门经理级别岗位下的人员列表

ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -131,12 +131,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	</delete>
 
 
-	<select id="selectPostByDeptId" parameterType="Long" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		where p.dept_id = #{deptId}
-	</select>
-
-
 	<select id="userPostAuthorityList"  resultType="UserPostAuthority">
 		SELECT
 			su."user_id" as userId,