Merge remote-tracking branch 'origin/master_20240722' into master_20240722

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/dal/mysql/info/CustomerInfoMapper.java

@@ -34,8 +34,8 @@ public interface CustomerInfoMapper extends BaseMapperX<CustomerInfoDO> {
                 .eqIfPresent(CustomerInfoDO::getTrade, reqVO.getTrade())
                 .eqIfPresent(CustomerInfoDO::getCustomerNature, reqVO.getCustomerNature())
                 .eqIfPresent(CustomerInfoDO::getCompanyAddress, reqVO.getCompanyAddress())
-                .eqIfPresent(CustomerInfoDO::getCustomerPerson, reqVO.getCustomerPerson())
-                .eqIfPresent(CustomerInfoDO::getCustomerPersonPhone, reqVO.getCustomerPersonPhone())
+                .likeIfPresent(CustomerInfoDO::getCustomerPerson, reqVO.getCustomerPerson())
+                .likeIfPresent(CustomerInfoDO::getCustomerPersonPhone, reqVO.getCustomerPersonPhone())
                 .eqIfPresent(CustomerInfoDO::getCompanyPersonAddress, reqVO.getCompanyPersonAddress())
                 .eqIfPresent(CustomerInfoDO::getCustomerFrom, reqVO.getCustomerFrom())
                 .eqIfPresent(CustomerInfoDO::getIsOpen, reqVO.getIsOpen())

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/leave/AttendanceLeaveController.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.attendance.controller.admin.leave;
 
 import cn.iocoder.yudao.module.attendance.controller.admin.business.vo.AttendanceBusinessRespVO;
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -43,6 +45,8 @@ public class AttendanceLeaveController {
     private AttendanceLeaveService leaveService;
     @Resource
     private DeptApi deptApi;
+    @Resource
+    private FileApi fileApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建请假信息")
@@ -83,6 +87,9 @@ public class AttendanceLeaveController {
                 respVO.setDeptName(dept.getName());
             }
         }
+        // 附件列表
+        List<FileDTO> fileList = fileApi.getFileDTOListByBiz(respVO.getLeaveId());
+        respVO.setFileList(fileList);
         return success(respVO);
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/leave/vo/AttendanceLeavePageReqVO.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.attendance.controller.admin.leave.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.*;
+
+import java.time.LocalDate;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -51,7 +53,7 @@ public class AttendanceLeavePageReqVO extends PageParam {
 
     @Schema(description = "开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] startDate;
+    private LocalDate[] startDate;
 
     @Schema(description = "具体时间，精确到上下午，am上午 pm下午")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -59,7 +61,7 @@ public class AttendanceLeavePageReqVO extends PageParam {
 
     @Schema(description = "结束日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] endDate;
+    private LocalDate[] endDate;
 
     @Schema(description = "具体时间，精确到上下午，am上午 pm下午")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/leave/vo/AttendanceLeaveRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.attendance.controller.admin.leave.vo;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -119,4 +120,7 @@ public class AttendanceLeaveRespVO {
     @ExcelProperty("租户编号")
     private Long tenantId;
 
+    @Schema(description = "附件列表")
+    private List<FileDTO> fileList;
+
 }

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/out/AttendanceOutController.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.attendance.controller.admin.out;
 
-import cn.iocoder.yudao.module.attendance.controller.admin.leave.vo.AttendanceLeaveRespVO;
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -43,6 +44,8 @@ public class AttendanceOutController {
     private AttendanceOutService outService;
     @Resource
     private DeptApi deptApi;
+    @Resource
+    private FileApi fileApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建公务外出信息")
@@ -83,6 +86,9 @@ public class AttendanceOutController {
                 respVO.setDeptName(dept.getName());
             }
         }
+        // 附件列表
+        List<FileDTO> fileList = fileApi.getFileDTOListByBiz(respVO.getOutId());
+        respVO.setFileList(fileList);
         return success(respVO);
     }
 

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/out/vo/AttendanceOutRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.attendance.controller.admin.out.vo;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -111,4 +112,7 @@ public class AttendanceOutRespVO {
     @ExcelProperty("租户编号")
     private Long tenantId;
 
+    @Schema(description = "附件列表")
+    private List<FileDTO> fileList;
+
 }

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/service/employeesetting/AttendanceEmployeeSettingServiceImpl.java

@@ -42,7 +42,6 @@ public class AttendanceEmployeeSettingServiceImpl implements AttendanceEmployeeS
     private EmployeeInfoService employeeInfoService;
 
     @Override
-    @TenantIgnore
     public Long createEmployeeSetting(AttendanceEmployeeSettingSaveReqVO createReqVO) {
         // 插入
         AttendanceEmployeeSettingDO employeeSetting = BeanUtils.toBean(createReqVO, AttendanceEmployeeSettingDO.class);
@@ -52,7 +51,6 @@ public class AttendanceEmployeeSettingServiceImpl implements AttendanceEmployeeS
     }
 
     @Override
-    @TenantIgnore
     public void updateEmployeeSetting(AttendanceEmployeeSettingSaveReqVO updateReqVO) {
         // 校验存在
         validateEmployeeSettingExists(updateReqVO.getId());
@@ -62,7 +60,6 @@ public class AttendanceEmployeeSettingServiceImpl implements AttendanceEmployeeS
     }
 
     @Override
-    @TenantIgnore
     public void deleteEmployeeSetting(Long id) {
         // 校验存在
         validateEmployeeSettingExists(id);
@@ -70,7 +67,6 @@ public class AttendanceEmployeeSettingServiceImpl implements AttendanceEmployeeS
         employeeSettingMapper.deleteById(id);
     }
 
-    @TenantIgnore
     private void validateEmployeeSettingExists(Long id) {
         if (employeeSettingMapper.selectById(id) == null) {
             throw exception(ATTENDANCE_EMPLOYEE_SETTING_NOT_EXISTS);
@@ -78,19 +74,16 @@ public class AttendanceEmployeeSettingServiceImpl implements AttendanceEmployeeS
     }
 
     @Override
-    @TenantIgnore
     public AttendanceEmployeeSettingDO getEmployeeSetting(Long id) {
         return employeeSettingMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public PageResult<AttendanceEmployeeSettingDO> getEmployeeSettingPage(AttendanceEmployeeSettingPageReqVO pageReqVO) {
         return employeeSettingMapper.selectPage(pageReqVO);
     }
 
     @Override
-    @TenantIgnore
     public PageResult<AttendanceEmployeeSettingRespVO> getEmployeeInfoSettingPage(AttendanceEmployeeSettingPageReqVO pageReqVO) {
         // 获取用户信息和租户ID
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
@@ -105,13 +98,11 @@ public class AttendanceEmployeeSettingServiceImpl implements AttendanceEmployeeS
     }
 
     @Override
-    @TenantIgnore
     public AttendanceEmployeeSettingRespVO getByEmployeeId(Long employeeId) {
         return employeeSettingMapper.getByEmployeeId(employeeId);
     }
 
     @Override
-    @TenantIgnore
     public void batchUpdateEmployeeSetting(AttendanceEmployeeSettingBatchSaveReqVO updateReqVO) {
         List<Long> employeeIds = updateReqVO.getEmployeeIds();
         Long schedulingId = updateReqVO.getSchedulingId();
@@ -164,7 +155,6 @@ public class AttendanceEmployeeSettingServiceImpl implements AttendanceEmployeeS
         }
     }
 
-    @TenantIgnore
     private boolean validateEmployeeSettingExistsByEmployeeId(Long employeeId) {
         return employeeSettingMapper.getByEmployeeId(employeeId) != null;
     }

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/service/info/AttendanceInfoServiceImpl.java

@@ -72,7 +72,6 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
     private AttendanceWorkdaySettingService workdaySettingService;
 
     @Override
-    @TenantIgnore
     public Long createInfo(AttendanceInfoSaveReqVO createReqVO) {
         // 插入
         AttendanceInfoDO info = BeanUtils.toBean(createReqVO, AttendanceInfoDO.class);
@@ -82,7 +81,6 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
     }
 
     @Override
-    @TenantIgnore
     public void updateInfo(AttendanceInfoSaveReqVO updateReqVO) {
         // 校验存在
         validateInfoExists(updateReqVO.getId());
@@ -92,7 +90,6 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
     }
 
     @Override
-    @TenantIgnore
     public void deleteInfo(Long id) {
         // 校验存在
         validateInfoExists(id);
@@ -100,7 +97,6 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
         infoMapper.deleteById(id);
     }
 
-    @TenantIgnore
     private void validateInfoExists(Long id) {
         if (infoMapper.selectById(id) == null) {
             throw exception(ATTENDANCE_INFO_NOT_EXISTS);
@@ -108,19 +104,16 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
     }
 
     @Override
-    @TenantIgnore
     public AttendanceInfoDO getInfo(Long id) {
         return infoMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public PageResult<AttendanceInfoDO> getInfoPage(AttendanceInfoPageReqVO pageReqVO) {
         return infoMapper.selectPage(pageReqVO);
     }
 
     @Override
-    @TenantIgnore
     @Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入
     public AttendanceInfoImportRespVO importAttendanceInfoList(List<AttendanceInfoImportExcelVO> importAttendanceInfos) {
         if (CollUtil.isEmpty(importAttendanceInfos)) {
@@ -179,12 +172,11 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
     }
 
     @Override
-    @TenantIgnore
     public PageResult<AttendanceDailyInfoRespVO> getDailyInfoPage(AttendanceDailyInfoPageReqVO pageReqVO) {
-        int currentPage = pageReqVO.getPageNo();
-        if (currentPage > 0) {
-            pageReqVO.setPageNo(currentPage - 1);
-        }
+//        int currentPage = pageReqVO.getPageNo();
+//        if (currentPage > 0) {
+//            pageReqVO.setPageNo(currentPage - 1);
+//        }
         List<AttendanceDailyInfoRespVO> list = infoMapper.getDailyInfoPage(pageReqVO);
         if (list != null && list.size() > 0) {
             for (AttendanceDailyInfoRespVO info : list) {
@@ -224,7 +216,6 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
     }
 
     @Override
-    @TenantIgnore
     public PageResult<AttendanceMonthlyInfoRespVO> getMonthlyInfoPage(AttendanceMonthlyInfoPageReqVO pageReqVO) {
         int currentPage = pageReqVO.getPageNo();
         if (currentPage > 0) {

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/service/schedulingmanage/AttendanceSchedulingManageServiceImpl.java

@@ -32,7 +32,6 @@ public class AttendanceSchedulingManageServiceImpl implements AttendanceScheduli
     private AttendanceSchedulingManageMapper schedulingManageMapper;
 
     @Override
-    @TenantIgnore
     public Long createSchedulingManage(AttendanceSchedulingManageSaveReqVO createReqVO) {
         // 插入
         AttendanceSchedulingManageDO schedulingManage = BeanUtils.toBean(createReqVO, AttendanceSchedulingManageDO.class);
@@ -42,7 +41,6 @@ public class AttendanceSchedulingManageServiceImpl implements AttendanceScheduli
     }
 
     @Override
-    @TenantIgnore
     public void updateSchedulingManage(AttendanceSchedulingManageSaveReqVO updateReqVO) {
         // 校验存在
         validateSchedulingManageExists(updateReqVO.getId());
@@ -52,7 +50,6 @@ public class AttendanceSchedulingManageServiceImpl implements AttendanceScheduli
     }
 
     @Override
-    @TenantIgnore
     public void deleteSchedulingManage(Long id) {
         // 校验存在
         validateSchedulingManageExists(id);
@@ -60,7 +57,6 @@ public class AttendanceSchedulingManageServiceImpl implements AttendanceScheduli
         schedulingManageMapper.deleteById(id);
     }
 
-    @TenantIgnore
     private void validateSchedulingManageExists(Long id) {
         if (schedulingManageMapper.selectById(id) == null) {
             throw exception(ATTENDANCE_SCHEDULING_MANAGE_NOT_EXISTS);
@@ -68,13 +64,11 @@ public class AttendanceSchedulingManageServiceImpl implements AttendanceScheduli
     }
 
     @Override
-    @TenantIgnore
     public AttendanceSchedulingManageDO getSchedulingManage(Long id) {
         return schedulingManageMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public PageResult<AttendanceSchedulingManageDO> getSchedulingManagePage(AttendanceSchedulingManagePageReqVO pageReqVO) {
         return schedulingManageMapper.selectPage(pageReqVO);
     }

yudao-module-personnel/yudao-module-employee-biz/src/main/java/cn/iocoder/yudao/module/employee/service/info/EmployeeInfoHistoryServiceImpl.java

@@ -31,7 +31,6 @@ public class EmployeeInfoHistoryServiceImpl implements EmployeeInfoHistoryServic
     private EmployeeInfoHistoryMapper infoHistoryMapper;
 
     @Override
-    @TenantIgnore
     public Long createInfoHistory(EmployeeInfoHistorySaveReqVO createReqVO) {
         // 插入
         // 生成id
@@ -43,7 +42,6 @@ public class EmployeeInfoHistoryServiceImpl implements EmployeeInfoHistoryServic
     }
 
     @Override
-    @TenantIgnore
     public void updateInfoHistory(EmployeeInfoHistorySaveReqVO updateReqVO) {
         // 校验存在
         validateInfoHistoryExists(updateReqVO.getId());
@@ -53,7 +51,6 @@ public class EmployeeInfoHistoryServiceImpl implements EmployeeInfoHistoryServic
     }
 
     @Override
-    @TenantIgnore
     public void deleteInfoHistory(Long id) {
         // 校验存在
         validateInfoHistoryExists(id);
@@ -61,7 +58,6 @@ public class EmployeeInfoHistoryServiceImpl implements EmployeeInfoHistoryServic
         infoHistoryMapper.deleteById(id);
     }
 
-    @TenantIgnore
     private void validateInfoHistoryExists(Long id) {
         if (infoHistoryMapper.selectById(id) == null) {
             throw exception(EMPLOYEE_INFO_HISTORY_NOT_EXISTS);
@@ -69,13 +65,11 @@ public class EmployeeInfoHistoryServiceImpl implements EmployeeInfoHistoryServic
     }
 
     @Override
-    @TenantIgnore
     public EmployeeInfoHistoryDO getInfoHistory(Long id) {
         return infoHistoryMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public PageResult<EmployeeInfoHistoryDO> getInfoHistoryPage(EmployeeInfoHistoryPageReqVO pageReqVO) {
         return infoHistoryMapper.selectPage(pageReqVO);
     }

yudao-module-personnel/yudao-module-employee-biz/src/main/java/cn/iocoder/yudao/module/employee/service/info/EmployeeInfoServiceImpl.java

@@ -226,7 +226,6 @@ public class EmployeeInfoServiceImpl implements EmployeeInfoService {
     }
 
     @Override
-    @TenantIgnore
     public void deleteInfo(Long id) {
         // 校验存在
         validateInfoExists(id);

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/service/contract/RelationsContractServiceImpl.java

@@ -51,15 +51,14 @@ public class RelationsContractServiceImpl implements RelationsContractService {
     private EmployeeApi employeeApi;
 
     @Override
-    @TenantIgnore
     public Long createContractInfo(RelationsContractSaveReqVO createReqVO) {
         // 查询该员工是否有合同存在
         List<RelationsContractDO> list = contractMapper.selectPage(new RelationsContractPageReqVO().setEmployeeId(createReqVO.getEmployeeId())).getList();
         // 获取用户信息和租户ID
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
+//        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
         Long userId = user != null && user.getId() != null ? user.getId() : 0L;
-        createReqVO.setTenantId(tenantId);
+//        createReqVO.setTenantId(tenantId);
         // 检查查询结果是否为空
         if (!CollUtil.isEmpty(list)) {
             // 更新状态
@@ -92,7 +91,6 @@ public class RelationsContractServiceImpl implements RelationsContractService {
     }
 
     @Override
-    @TenantIgnore
     public void updateContractInfo(RelationsContractSaveReqVO updateReqVO) {
         // 校验存在
         validateContractInfoExists(updateReqVO.getId());
@@ -104,7 +102,6 @@ public class RelationsContractServiceImpl implements RelationsContractService {
     }
 
     @Override
-    @TenantIgnore
     public void deleteContractInfo(Long id) {
         // 校验存在
         validateContractInfoExists(id);
@@ -120,13 +117,11 @@ public class RelationsContractServiceImpl implements RelationsContractService {
     }
 
     @Override
-    @TenantIgnore
     public RelationsContractDO getContractInfo(Long id) {
         return contractMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public RelationsContractRespVO getById(Long id) {
         // 第一步：检查ID是否为空
         if (id == null) {
@@ -154,13 +149,11 @@ public class RelationsContractServiceImpl implements RelationsContractService {
     }
 
     @Override
-    @TenantIgnore
     public PageResult<RelationsContractDO> getContractInfoPage(RelationsContractPageReqVO pageReqVO) {
         return contractMapper.selectPage(pageReqVO);
     }
 
     @Override
-    @TenantIgnore
     public int effectiveContractInfo() {
         // 1. 查询状态为已完成且已到合同开始日期的合同
         List<RelationsContractDO> doneContracts = contractMapper.selectListByStatusAndEffectiveDateGe(

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/service/conversion/RelationsConversionServiceImpl.java

@@ -47,13 +47,12 @@ public class RelationsConversionServiceImpl implements RelationsConversionServic
     private EmployeeApi employeeApi;
 
     @Override
-    @TenantIgnore
     public Long createConversion(RelationsConversionSaveReqVO createReqVO) {
         // 获取用户信息和租户ID
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
+//        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
         Long userId = user != null && user.getId() != null ? user.getId() : 0L;
-        createReqVO.setTenantId(tenantId);
+//        createReqVO.setTenantId(tenantId);
         // 转正人信息
         EmployeeRespDTO employee = employeeApi.getEmployeeById(createReqVO.getEmployeeId());
         createReqVO.setEmployeeId(employee.getId());
@@ -86,7 +85,6 @@ public class RelationsConversionServiceImpl implements RelationsConversionServic
     }
 
     @Override
-    @TenantIgnore
     public void updateConversion(RelationsConversionSaveReqVO updateReqVO) {
         // 校验存在
         validateConversionExists(updateReqVO.getId());
@@ -105,7 +103,6 @@ public class RelationsConversionServiceImpl implements RelationsConversionServic
     }
 
     @Override
-    @TenantIgnore
     public void deleteConversion(Long id) {
         // 校验存在
         validateConversionExists(id);
@@ -113,7 +110,6 @@ public class RelationsConversionServiceImpl implements RelationsConversionServic
         conversionMapper.deleteById(id);
     }
 
-    @TenantIgnore
     private void validateConversionExists(Long id) {
         if (conversionMapper.selectById(id) == null) {
             throw exception(RELATIONS_CONVERSION_NOT_EXISTS);
@@ -121,13 +117,11 @@ public class RelationsConversionServiceImpl implements RelationsConversionServic
     }
 
     @Override
-    @TenantIgnore
     public RelationsConversionDO getConversion(Long id) {
         return conversionMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public RelationsConversionRespVO getById(Long id) {
         // 第一步：检查ID是否为空
         if (id == null) {
@@ -163,7 +157,6 @@ public class RelationsConversionServiceImpl implements RelationsConversionServic
     }
 
     @Override
-    @TenantIgnore
     public PageResult<RelationsConversionDO> getConversionPage(RelationsConversionPageReqVO pageReqVO) {
         return conversionMapper.selectPage(pageReqVO);
     }

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/service/entry/RelationsEntryServiceImpl.java

@@ -47,13 +47,12 @@ public class RelationsEntryServiceImpl implements RelationsEntryService {
     private EmployeeApi employeeApi;
 
     @Override
-    @TenantIgnore
     public Long createEntry(RelationsEntrySaveReqVO createReqVO) {
         // 获取用户信息和租户ID
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
+//        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
         Long userId = user != null && user.getId() != null ? user.getId() : 0L;
-        createReqVO.setTenantId(tenantId);
+//        createReqVO.setTenantId(tenantId);
         // 插入
         String infoId = IdUtil.fastSimpleUUID();
         createReqVO.setEntryId(infoId);
@@ -79,7 +78,6 @@ public class RelationsEntryServiceImpl implements RelationsEntryService {
     }
 
     @Override
-    @TenantIgnore
     public void updateEntry(RelationsEntrySaveReqVO updateReqVO) {
         // 校验存在
         validateEntryExists(updateReqVO.getId());
@@ -91,7 +89,6 @@ public class RelationsEntryServiceImpl implements RelationsEntryService {
     }
 
     @Override
-    @TenantIgnore
     public void deleteEntry(Long id) {
         // 校验存在
         validateEntryExists(id);
@@ -99,7 +96,6 @@ public class RelationsEntryServiceImpl implements RelationsEntryService {
         entryMapper.deleteById(id);
     }
 
-    @TenantIgnore
     private void validateEntryExists(Long id) {
         if (entryMapper.selectById(id) == null) {
             throw exception(RELATIONS_ENTRY_NOT_EXISTS);
@@ -107,13 +103,11 @@ public class RelationsEntryServiceImpl implements RelationsEntryService {
     }
 
     @Override
-    @TenantIgnore
     public RelationsEntryDO getEntry(Long id) {
         return entryMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public RelationsEntryRespVO getById(Long id) {
         // 第一步：检查ID是否为空
         if (id == null) {
@@ -149,7 +143,6 @@ public class RelationsEntryServiceImpl implements RelationsEntryService {
     }
 
     @Override
-    @TenantIgnore
     public PageResult<RelationsEntryDO> getEntryPage(RelationsEntryPageReqVO pageReqVO) {
         return entryMapper.selectPage(pageReqVO);
     }

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/service/renew/RelationsRenewServiceImpl.java

@@ -47,13 +47,12 @@ public class RelationsRenewServiceImpl implements RelationsRenewService {
     private EmployeeApi employeeApi;
 
     @Override
-    @TenantIgnore
     public Long createRenew(RelationsRenewSaveReqVO createReqVO) {
         // 获取用户信息和租户ID
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
+//        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
         Long userId = user != null && user.getId() != null ? user.getId() : 0L;
-        createReqVO.setTenantId(tenantId);
+//        createReqVO.setTenantId(tenantId);
         // 插入
         String infoId = IdUtil.fastSimpleUUID();
         createReqVO.setRenewId(infoId);
@@ -86,7 +85,6 @@ public class RelationsRenewServiceImpl implements RelationsRenewService {
     }
 
     @Override
-    @TenantIgnore
     public void updateRenew(RelationsRenewSaveReqVO updateReqVO) {
         // 校验存在
         validateRenewExists(updateReqVO.getId());
@@ -105,7 +103,6 @@ public class RelationsRenewServiceImpl implements RelationsRenewService {
     }
 
     @Override
-    @TenantIgnore
     public void deleteRenew(Long id) {
         // 校验存在
         validateRenewExists(id);
@@ -113,7 +110,6 @@ public class RelationsRenewServiceImpl implements RelationsRenewService {
         renewMapper.deleteById(id);
     }
 
-    @TenantIgnore
     private void validateRenewExists(Long id) {
         if (renewMapper.selectById(id) == null) {
             throw exception(RELATIONS_RENEW_NOT_EXISTS);
@@ -121,13 +117,11 @@ public class RelationsRenewServiceImpl implements RelationsRenewService {
     }
 
     @Override
-    @TenantIgnore
     public RelationsRenewDO getRenew(Long id) {
         return renewMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public RelationsRenewRespVO getById(Long id) {
         // 第一步：检查ID是否为空
         if (id == null) {
@@ -163,7 +157,6 @@ public class RelationsRenewServiceImpl implements RelationsRenewService {
     }
 
     @Override
-    @TenantIgnore
     public PageResult<RelationsRenewDO> getRenewPage(RelationsRenewPageReqVO pageReqVO) {
         return renewMapper.selectPage(pageReqVO);
     }

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/service/turnover/RelationsTurnoverServiceImpl.java

@@ -47,13 +47,12 @@ public class RelationsTurnoverServiceImpl implements RelationsTurnoverService {
     private EmployeeApi employeeApi;
 
     @Override
-    @TenantIgnore
     public Long createTurnover(RelationsTurnoverSaveReqVO createReqVO) {
         // 获取用户信息和租户ID
         LoginUser user = SecurityFrameworkUtils.getLoginUser();
-        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
+//        Long tenantId = user != null && user.getTenantId() != null ? user.getTenantId() : 0L;
         Long userId = user != null && user.getId() != null ? user.getId() : 0L;
-        createReqVO.setTenantId(tenantId);
+//        createReqVO.setTenantId(tenantId);
         // 插入
         String infoId = IdUtil.fastSimpleUUID();
         createReqVO.setTurnoverId(infoId);
@@ -86,7 +85,6 @@ public class RelationsTurnoverServiceImpl implements RelationsTurnoverService {
     }
 
     @Override
-    @TenantIgnore
     public void updateTurnover(RelationsTurnoverSaveReqVO updateReqVO) {
         // 校验存在
         validateTurnoverExists(updateReqVO.getId());
@@ -105,7 +103,6 @@ public class RelationsTurnoverServiceImpl implements RelationsTurnoverService {
     }
 
     @Override
-    @TenantIgnore
     public void deleteTurnover(Long id) {
         // 校验存在
         validateTurnoverExists(id);
@@ -113,7 +110,6 @@ public class RelationsTurnoverServiceImpl implements RelationsTurnoverService {
         turnoverMapper.deleteById(id);
     }
 
-    @TenantIgnore
     private void validateTurnoverExists(Long id) {
         if (turnoverMapper.selectById(id) == null) {
             throw exception(RELATIONS_TURNOVER_NOT_EXISTS);
@@ -121,13 +117,11 @@ public class RelationsTurnoverServiceImpl implements RelationsTurnoverService {
     }
 
     @Override
-    @TenantIgnore
     public RelationsTurnoverDO getTurnover(Long id) {
         return turnoverMapper.selectById(id);
     }
 
     @Override
-    @TenantIgnore
     public RelationsTurnoverRespVO getById(Long id) {
         // 第一步：检查ID是否为空
         if (id == null) {
@@ -163,7 +157,6 @@ public class RelationsTurnoverServiceImpl implements RelationsTurnoverService {
     }
 
     @Override
-    @TenantIgnore
     public PageResult<RelationsTurnoverDO> getTurnoverPage(RelationsTurnoverPageReqVO pageReqVO) {
         return turnoverMapper.selectPage(pageReqVO);
     }