fix: 修正天气和拉力的id查询条件

3 months ago · fc85f2edc0
parent ef9cc85a81
commit fc85f2edc0
2 changed files with 6 additions and 2 deletions
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LeadPullsServiceImpl.java
@ -48,7 +48,9 @@ public class LeadPullsServiceImpl implements LeadPullsService {
        if (end != null) {
            criteria.andUpdateTimeLessThanOrEqualTo(end);
        }
-        criteria.andTermIdIn(idList);
+        if (idList.size() > 0) {
+            criteria.andTermIdIn(idList);
+        }
        example.setOrderByClause("update_time desc");

        if (pageNum != null && pageSize != null) {
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/WeatherServiceImpl.java
@ -46,7 +46,9 @@ public class WeatherServiceImpl implements WeatherService {
        if (end != null) {
            criteria.andUpdateTimeLessThanOrEqualTo(end);
        }
-        criteria.andTermIdIn(idList);
+        if (idList.size() > 0) {
+            criteria.andTermIdIn(idList);
+        }
        example.setOrderByClause("update_time desc");

        if (pageNum != null && pageSize != null) {