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/service/info/CustomerInfoServiceImpl.java

@@ -141,7 +141,6 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
     }
 
     @Override
-    @TenantIgnore
     public CustomerInfoRespVO getById(Long id) {
         // 第一步：检查ID是否为空
         if (id == null) {

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

@@ -148,6 +148,7 @@ public class AttendanceLeaveController {
     @ApiAccessLog(operateType = EXPORT)
     public void exportLeaveExcel(@Valid AttendanceLeavePageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         PageResult<AttendanceLeaveDO> pageResult = leaveService.getLeavePage(pageReqVO);
         PageResult<AttendanceLeaveRespVO> result = BeanUtils.toBean(pageResult, AttendanceLeaveRespVO.class);
         // 请假类型

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

@@ -192,7 +192,6 @@ public class EmployeeInfoServiceImpl implements EmployeeInfoService {
     }
 
     @Override
-    @TenantIgnore
     public Integer updateInfo(EmployeeInfoSaveReqVO updateReqVO) {
         // 校验存在
         validateInfoExists(updateReqVO.getId());
@@ -249,7 +248,6 @@ public class EmployeeInfoServiceImpl implements EmployeeInfoService {
     }
 
     @Override
-    @TenantIgnore
     public Integer updateEmpInfo(EmployeeInfoSaveReqVO updateReqVO) {
         // 校验存在
         validateInfoExists(updateReqVO.getId());