修复bug

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/service/businessopportunity/CustomerBusinessOpportunityServiceImpl.java

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

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.attendance.service.employeesetting;
 
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
@@ -91,10 +92,17 @@ public class AttendanceEmployeeSettingServiceImpl implements AttendanceEmployeeS
         pageReqVO.setTenantId(tenantId);
         int currentPage = pageReqVO.getPageNo();
         if (currentPage > 0) {
-            pageReqVO.setPageNo(currentPage - 1);
+            currentPage = currentPage - 1;
         }
+        pageReqVO.setPageNo(currentPage * pageReqVO.getPageSize());
         List<AttendanceEmployeeSettingRespVO> list = employeeSettingMapper.getEmployeeInfoSettingPage(pageReqVO);
-        return new PageResult<>(list, (long) list.size());
+        Long total = 0L;
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<AttendanceEmployeeSettingRespVO> totalList = employeeSettingMapper.getEmployeeInfoSettingPage(pageReqVO);
+        if (totalList != null && totalList.size() > 0) {
+            total = (long) totalList.size();
+        }
+        return new PageResult<>(list, total);
     }
 
     @Override

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

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.attendance.service.info;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
@@ -225,8 +226,9 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
     public PageResult<AttendanceDailyInfoRespVO> getDailyInfoPage(AttendanceDailyInfoPageReqVO pageReqVO) {
         int currentPage = pageReqVO.getPageNo();
         if (currentPage > 0) {
-            pageReqVO.setPageNo(currentPage - 1);
+            currentPage = currentPage - 1;
         }
+        pageReqVO.setPageNo(currentPage * pageReqVO.getPageSize());
         List<AttendanceDailyInfoRespVO> list = infoMapper.getDailyInfoPage(pageReqVO);
         if (list != null && list.size() > 0) {
             for (AttendanceDailyInfoRespVO info : list) {
@@ -262,7 +264,13 @@ public class AttendanceInfoServiceImpl implements AttendanceInfoService {
                 }
             }
         }
-        return new PageResult<>(list, (long) list.size());
+        Long total = 0L;
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<AttendanceDailyInfoRespVO> totalList = infoMapper.getDailyInfoPage(pageReqVO);
+        if (totalList != null && totalList.size() > 0) {
+            total = (long) totalList.size();
+        }
+        return new PageResult<>(list, total);
     }
 
     @Override

yudao-module-personnel/yudao-module-attendance-biz/src/main/resources/mapper/info/AttendanceInfoMapper.xml

@@ -40,6 +40,8 @@
         <if test="reqVO.deptId != null and reqVO.deptId != ''">
             AND ai.dept_id = #{reqVO.deptId}
         </if>
+        GROUP BY
+            ai.employee_name,ai.attendance_date
         ORDER BY
             ai.employee_name,ai.attendance_date,ai.dept_name
         <if test="reqVO.pageSize != null and reqVO.pageNo != null and reqVO.pageSize != -1">