diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubSubcontractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubSubcontractController.java index a65d8ba1..7705513d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubSubcontractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubSubcontractController.java @@ -1,6 +1,7 @@ package org.dromara.contractor.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -38,9 +39,9 @@ public class SubSubcontractController extends BaseController { private ISubSubcontractService subcontractService; /** - * 查询分包合同列表 + * 查询分包合同列表 project:projectTeam:addTeam */ - @SaCheckPermission("contractor:subcontract:list") + @SaCheckPermission(value = {"contractor:subcontract:list", "project:projectTeam:addTeam"}, mode = SaMode.OR) @GetMapping("/list") public TableDataInfo list(SubSubcontractQueryReq req, PageQuery pageQuery) { return subcontractService.queryPageList(req, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java index 6816ce8f..65c8e8e6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java @@ -388,8 +388,11 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl selectUserListByContractorId(Long contractorId); + void deleteContractorIdByUserId(Long userId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 1a3059b8..270cc271 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -1563,4 +1563,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService { .eq(SysUser::getAppUserType, "2") ); } + + @Override + public void deleteContractorIdByUserId(Long userId) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SysUser::getUserId, userId).set(SysUser::getContractorId, null); + baseMapper.update(null, wrapper); + } }