From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarMastController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarMastController.java b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
index 5a15058..45977ff 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarMastController.java
@@ -36,7 +36,7 @@
@RequestMapping(value = "/basJarMast/JatId/auth")
@ManagerAuth
public R getJatIdList(@RequestParam Integer id){
- List<BasJarMast> jarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", id));
+ List<BasJarMast> jarMasts = basJarMastService.selectList(new EntityWrapper<BasJarMast>().eq("jar_id", id).orderBy("jar_loc_digit",true));
if (Cools.isEmpty(jarMasts)){
return R.error("鏈煡璇㈠埌淇℃伅");
}
@@ -51,7 +51,8 @@
wrkDetls.add(wrkDetl);
}
if (Cools.isEmpty(wrkMast) || Cools.isEmpty(wrkDetls)){
- return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+// return R.error("鏈煡璇㈠埌浠诲姟鏁版嵁");
+ continue;
}
jarMastTableVo.setId(++idSign);
--
Gitblit v1.9.1