集群管理，按到期时间查询到的部分数据未在设置时间范围内

simulation-resource-server/src/main/resources/mapper/system/ClusterMapper.xml

@@ -32,10 +32,14 @@
             <if test="modifyTimeEnd != null and modifyTimeEnd != ''">
                 and p.modify_time &lt;= #{modifyTimeEnd}
             </if>
-            <if test="dueTimeStart != null and dueTimeStart != ''">
-                and (p.date_simulation_license &gt;= #{dueTimeStart} or p.date_dynamic_license &gt;= #{dueTimeStart})
+            <if test="dueTimeStart != null and dueTimeStart != '' and dueTimeEnd != null and dueTimeEnd != ''">
+            and ((p.date_simulation_license &gt;= #{dueTimeStart} and p.date_simulation_license &lt;= #{dueTimeEnd})
+            or (p.date_dynamic_license &gt;= #{dueTimeStart} and p.date_dynamic_license &lt;= #{dueTimeEnd})  )
             </if>
-            <if test="dueTimeEnd != null and dueTimeEnd != ''">
+        <if test="dueTimeStart != null and dueTimeStart != '' and (dueTimeEnd == null or dueTimeEnd == '')">
+            and (p.date_simulation_license &gt;= #{dueTimeStart} or p.date_dynamic_license &gt;= #{dueTimeStart})
+        </if>
+            <if test="dueTimeEnd != null and dueTimeEnd != '' and ( dueTimeStart == null or dueTimeStart == '' )">
                 and (p.date_simulation_license &lt;= #{dueTimeEnd} or p.date_dynamic_license &lt;= #{dueTimeEnd})
             </if>
         order by p.modify_time desc