From 1bca6724e27a66b39d5494576564f57dd2202399 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 17 九月 2025 08:43:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PackController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 0d72bf8..6347d91 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -49,7 +49,7 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy("settle").orderBy("create_time", false);
}
return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -79,7 +79,7 @@
pack.setCreateBy(getUserId());
pack.setCreateTime(now);
if (!packService.insert(pack)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("man_pack鍒涘缓寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
Mat mat = new Mat();
mat.setTagId(tagService.getTop().getId());
@@ -88,8 +88,9 @@
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
+ mat.setMemo("鎵撳寘涓婄嚎");
if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鐗╂枡淇℃伅鍒涘缓寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
return R.ok();
}
--
Gitblit v1.9.1