1、7596用印列表导出问题

2、7597用印列表根据数据来源查询问题

yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/stamp/stampinfo/OaStampInfoMapper.xml

@@ -36,6 +36,9 @@
         <if test="page.createEmployeeName != null and page.createEmployeeName != ''">
             AND ei2.name like concat('%',#{page.createEmployeeName},'%')
         </if>
+        <if test="page.infoSource != null and page.infoSource != ''">
+            AND si.info_source = #{page.infoSource}
+        </if>
         <if test="page.createTime != null and page.createTime.length > 0">
             AND si.create_time BETWEEN #{page.createTime[0]} AND #{page.createTime[1]}
         </if>
@@ -85,10 +88,15 @@
         <if test="page.createEmployeeName != null and page.createEmployeeName != ''">
             AND ei2.name like concat('%',#{page.createEmployeeName},'%')
         </if>
+        <if test="page.infoSource != null and page.infoSource != ''">
+            AND si.info_source = #{page.infoSource}
+        </if>
         <if test="page.createTime != null and page.createTime.length > 0">
             AND si.create_time BETWEEN #{page.createTime[0]} AND #{page.createTime[1]}
         </if>
         ORDER BY si.create_time DESC
-        LIMIT #{page.pageNo}, #{page.pageSize}
+        <if test="page.pageSize != -1">
+            LIMIT #{page.pageNo}, #{page.pageSize}
+        </if>
     </select>
 </mapper>