zoujiajian 2 жил өмнө
parent
commit
11b3e2c7ac

+ 2 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -2,6 +2,7 @@ package com.cyksj.web.controller.manage;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
@@ -182,7 +183,7 @@ public class CmsOrderController {
 			}
 			conditionSb.append(String.format(" and os.%s != 0", dsTypeField));
 		}
-		if (orderStatus != null) {
+		if (CollUtil.isNotEmpty(orderStatus)) {
 			conditionSb.append(String.format(" and os.status in %s", Jsons.toJson(orderStatus).replaceAll("\\[", "(").replaceAll("]", ")")));
 		}
 		String conditionSql = null;