From 9ae7c6a2d11b1fcf9fef01b310a543414c7b427e Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 07 二月 2025 07:51:29 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/controller/BasLocStsController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index 400f2e7..328e573 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -37,8 +37,8 @@
                   @RequestParam(required = false)String orderByField,
                   @RequestParam(required = false)String orderByType,
                   @RequestParam Map<String, Object> param){
-        excludeTrash(param);
         EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
         convert(param, wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         return R.ok(basLocStsService.selectPage(new Page<>(curr, limit), wrapper));
@@ -61,7 +61,7 @@
     @ManagerAuth
     public R edit(BasLocSts basLocSts) {
         if (Cools.isEmpty(basLocSts)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == basLocSts.getLocSts()){
             basLocStsService.insert(basLocSts);
@@ -86,7 +86,7 @@
     @ManagerAuth(memo = "搴撲綅鐘舵�佷慨鏀�")
     public R update(BasLocSts basLocSts){
         if (Cools.isEmpty(basLocSts) || null==basLocSts.getLocSts()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basLocSts.setModiUser(getUserId());
         basLocSts.setModiTime(new Date());
@@ -99,7 +99,7 @@
     public R delete(@RequestParam String param){
         List<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (BasLocSts entity : list){
             basLocStsService.delete(new EntityWrapper<>(entity));

--
Gitblit v1.9.1