From e067cfb3cab9e36ce85fc80ff13edea69149bb99 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 13 十二月 2023 17:42:41 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/java/com/zy/asrs/utils/Utils.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 2050e35..d456395 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -256,7 +256,7 @@
}
public static void main(String[] args) {
- System.out.println(JSON.toJSONString(getGroupDeepLoc("1505908")));
+ System.out.println(JSON.toJSONString(getGroupInnerLoc("1505908")));
}
/**
@@ -441,7 +441,7 @@
if(Cools.isEmpty(condition) || "null".equals(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
- wrapper.eq(column,condition);
+ wrapper.andNew().eq(column,condition);
}
}
--
Gitblit v1.9.1