Prechádzať zdrojové kódy

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

dongpo 2 mesiacov pred
rodič
commit
5d7c7a55a5

+ 1 - 1
yudao-module-personnel/yudao-module-attendance-biz/src/main/resources/mapper/employeesetting/AttendanceEmployeeSettingMapper.xml

@@ -66,7 +66,7 @@
             AND ei.dept_id = #{reqVO.deptId}
         </if>
         ORDER BY ei.id
-        <if test="reqVO.pageSize != null and reqVO.pageNo != null">
+        <if test="reqVO.pageSize != null and reqVO.pageNo != null and reqVO.pageSize != -1">
             LIMIT #{reqVO.pageNo}, #{reqVO.pageSize}
         </if>
     </select>