人员管理

2025-11-25 19:15:12 +08:00
parent 77482c71b3
commit d32947afe2
7 changed files with 30 additions and 12 deletions
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java
@ -1,6 +1,7 @@
 package org.dromara.contractor.controller;

 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
@ -26,9 +27,12 @@ import org.dromara.common.web.core.BaseController;
 import org.dromara.contractor.domain.SubConstructionUser;
 import org.dromara.contractor.domain.SubConstructionUserFile;
 import org.dromara.contractor.domain.dto.constructionuser.*;
+import org.dromara.contractor.domain.dto.contractor.SubContractorQueryReq;
 import org.dromara.contractor.domain.vo.constructionuser.*;
+import org.dromara.contractor.domain.vo.contractor.SubContractorVo;
 import org.dromara.contractor.service.ISubConstructionUserFileService;
 import org.dromara.contractor.service.ISubConstructionUserService;
+import org.dromara.contractor.service.ISubContractorService;
 import org.dromara.project.domain.dto.project.BusProjectQueryReq;
 import org.dromara.project.domain.dto.projectteam.BusProjectTeamQueryReq;
 import org.dromara.project.domain.dto.projectteammember.BusProjectTeamMemberCreateReq;
@ -75,6 +79,8 @@ public class SubConstructionUserController extends BaseController {
    private final IdCardEncryptorUtil idCardEncryptorUtil;
    private final ISubConstructionUserFileService constructionUserFileService;

+    private final ISubContractorService contractorService;
+
    /**
     * 查询施工人员列表
     */
@ -84,6 +90,15 @@ public class SubConstructionUserController extends BaseController {
        return constructionUserService.queryPageList(req, pageQuery);
    }

+    /**
+     * 查询分包单位列表
+     */
+    @GetMapping("/subContractorList")
+    public TableDataInfo<SubContractorVo> list(SubContractorQueryReq req, PageQuery pageQuery) {
+        return contractorService.queryPageList(req, pageQuery);
+    }
+
+

    /**
     * 新人池
@ -140,7 +155,7 @@ public class SubConstructionUserController extends BaseController {
     *
     * @param id 主键
     */
-    @SaCheckPermission("contractor:constructionUser:query")
+//    @SaCheckPermission("contractor:constructionUser:query")
    @GetMapping("/{id}")
    public R<SubConstructionUserVo> getInfo(@NotNull(message = "主键不能为空")
                                            @PathVariable Long id) {
@ -232,7 +247,7 @@ public class SubConstructionUserController extends BaseController {
    /**
     * 施工人员迁移
     */
-    @SaCheckPermission("contractor:constructionUser:edit")
+    @SaCheckPermission("contractor:constructionUser:change")
    @Log(title = "施工人员", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping("/change/project")
@ -265,7 +280,7 @@ public class SubConstructionUserController extends BaseController {
    /**
     * 查询项目班组列表
     */
-    @SaCheckPermission("project:projectTeam:addTeam")
+//    @SaCheckPermission("project:projectTeam:addTeam")
    @GetMapping("/teamList")
    public TableDataInfo<BusProjectTeamVo> teamList(BusProjectTeamQueryReq req, PageQuery pageQuery) {
        return busProjectTeamService.queryPageList(req, pageQuery);
@ -274,7 +289,7 @@ public class SubConstructionUserController extends BaseController {
    /**
     * 添加项目班组
     */
-    @SaCheckPermission("project:projectTeam:addTeam")
+    @SaCheckPermission(value = {"project:projectTeam:addTeam", "contractor:constructionUser:addTeam"}, mode = SaMode.OR)
    @RepeatSubmit()
    @PostMapping("/addTeam")
    public R<Long> add(@Validated(AddGroup.class) @RequestBody BusProjectTeamMemberCreateReq req) {
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserFileController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserFileController.java
@ -39,7 +39,7 @@ public class SubConstructionUserFileController extends BaseController {
    /**
     * 查询施工人员文件存储列表
     */
-    @SaCheckPermission(value = {"project:constructionUserFile:list", "contractor:constructionUserFile:list"}, mode = SaMode.OR)
+    //@SaCheckPermission(value = {"project:constructionUserFile:list", "contractor:constructionUserFile:list"}, mode = SaMode.OR)
    @GetMapping("/list")
    public R<List<SubConstructionUserFileVo>> list(SubConstructionUserFileQueryReq req) {
        return R.ok(constructionUserFileService.queryList(req));
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/controller/PdMasterController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/controller/PdMasterController.java
@ -46,7 +46,6 @@ public class PdMasterController extends BaseController {
    /**
     * 获取当前用户对应部门下的所有用户
     */
-    @SaCheckPermission("patch:master:findThis")
    @GetMapping("/findThis")
    public R<List<SysUser>> findThis() {
        return R.ok(userService.findThis());
@ -97,7 +96,7 @@ public class PdMasterController extends BaseController {
    /**
     * 查询派单列表
     */
-    @SaCheckPermission("patch:master:list")
+//    @SaCheckPermission("patch:master:list")
    @GetMapping("/list")
    public TableDataInfo<PdMasterVo> list(PdMasterBo bo, PageQuery pageQuery) {
        return pdMasterService.queryPageList(bo, pageQuery);
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionBlacklistController.java
@ -1,6 +1,7 @@
 package org.dromara.project.controller;

 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@ -72,7 +73,7 @@ public class BusConstructionBlacklistController extends BaseController {
    /**
     * 新增黑名单
     */
-    @SaCheckPermission("project:constructionBlacklist:add")
+    @SaCheckPermission(value = {"project:constructionBlacklist:add", "contractor:constructionUser:constructionBlacklist"}, mode = SaMode.OR)
    @Log(title = "黑名单", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
@ -1,6 +1,7 @@
 package org.dromara.project.controller;

 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
@ -128,7 +129,10 @@ public class BusProjectController extends BaseController {
    /**
     * 查询项目以及项目下的分包公司列表
     */
-    @SaCheckPermission("project:project:listProjectContractorList")
+    @SaCheckPermission(value = {
+        "project:project:listProjectContractorList",
+        "contractor:constructionUser:change"
+    }, mode = SaMode.OR)
    @GetMapping("/list/project/contractorList")
    public R<List<BusProjectContractorTeamListVo>> listProjectContractorList() {
        return R.ok(projectService.queryContractorTeamList());
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
@ -88,7 +88,7 @@ public class BusProjectTeamController extends BaseController {
     *
     * @param id 主键
     */
-    @SaCheckPermission("project:projectTeam:query")
+//    @SaCheckPermission("project:projectTeam:query")
    @GetMapping("/{id}")
    public R<BusProjectTeamVo> getInfo(@NotNull(message = "主键不能为空")
                                       @PathVariable Long id) {
@ -133,7 +133,6 @@ public class BusProjectTeamController extends BaseController {
    /**
     * 考勤范围列表
     */
-    @SaCheckPermission("project:projectTeam:editPunchRange")
    @GetMapping("/rangeList")
    public TableDataInfo<BusProjectPunchrangeVo> list(BusProjectPunchrangeBo bo, PageQuery pageQuery) {
        return busProjectPunchrangeService.queryPageList(bo, pageQuery);
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@ -352,7 +352,7 @@ public class SysUserController extends BaseController {
    /**
     * 获取部门树列表
     */
-    @SaCheckPermission("system:user:list")
+//    @SaCheckPermission("system:user:list")
    @GetMapping("/deptTree")
    public R<List<Tree<Long>>> deptTree(SysDeptBo dept) {
        return R.ok(deptService.selectDeptTreeList(dept));