2023年8月31日13:38:51

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/AttachmngsController.java

@@ -46,7 +46,6 @@ public class AttachmngsController {
         if (file.isEmpty()) {
             return AjaxResult.error("上传失败请重试1");
         }
-
         System.out.println("水印时间");
         System.out.println(date);
 

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -208,7 +208,6 @@
             <if test="dataStart != null and dataStart != '' and dataEnd != null and dataEnd != ''">
                 and b.BillDate >= #{dataStart, jdbcType=VARCHAR} and b.BillDate &lt;= #{dataEnd, jdbcType=VARCHAR}
             </if>
-            and p.IFORDER1ED='T'
             <if test="role == 0">
                 and p.DeptUserID = #{emplId, jdbcType=VARCHAR}
             </if>