From 060b882a5822c99bb19053db724379396170e40e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 15 十月 2023 11:28:13 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/utils/Utils.java | 5 +++--
1 files changed, 3 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 fb9d3a1..49274c9 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -229,6 +229,7 @@
for (Integer row0 : CommonService.SIXTH_GROUP_ROW_LIST) {
result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
}
+ Collections.reverse(result);
return result;
}
if (CommonService.SEVENTH_GROUP_ROW_LIST.contains(row) && bay < 59) {
@@ -249,7 +250,7 @@
}
public static void main(String[] args) {
- System.out.println(JSON.toJSONString(getGroupLoc("0703409")));
+ System.out.println(JSON.toJSONString(getGroupLoc("1305908")));
}
/**
@@ -387,7 +388,7 @@
public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
if(Cools.isEmpty(condition)){
- wrapper.isNull(column);
+ wrapper.andNew().eq(column,"").or().isNull(column);
}else {
wrapper.eq(column,condition);
}
--
Gitblit v1.9.1