From f6c078d34a597fb709273440374f0c85823f1be5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 15 六月 2022 12:53:36 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 553be70..6d0f388 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -92,7 +92,7 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param,
@RequestParam(required = false)Boolean unreason){
- if (unreason) {
+ if (!Cools.isEmpty(unreason) && unreason) {
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
.where(" DATALENGTH( batch ) != 11 or\n" +
--
Gitblit v1.9.1