From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasWhsController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index 2de999b..d677ad9 100644
--- a/src/main/java/com/zy/asrs/controller/BasWhsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -58,7 +58,7 @@
}
@RequestMapping(value = "/basWhs/add/auth")
- @ManagerAuth(memo = "搴撲綅绫诲瀷娣诲姞")
+ @ManagerAuth(memo = "response.warehouse_add")
public R add(BasWhs basWhs) {
basWhs.setModiUser(getUserId());
basWhs.setModiTime(new Date());
@@ -69,7 +69,7 @@
}
@RequestMapping(value = "/basWhs/update/auth")
- @ManagerAuth(memo = "搴撲綅绫诲瀷淇敼")
+ @ManagerAuth(memo = "response.warehouse_update")
public R update(BasWhs basWhs){
if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
return R.error();
@@ -81,20 +81,20 @@
}
@RequestMapping(value = "/basWhs/delete/auth")
- @ManagerAuth(memo = "搴撲綅绫诲瀷鍒犻櫎")
+ @ManagerAuth(memo = "response.warehouse_delete")
public R delete(@RequestParam String param){
List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.select_at_least_one_delete_data");
}
for (BasWhs entity : list){
basWhsService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/basWhs/export/auth")
- @ManagerAuth(memo = "搴撲綅绫诲瀷瀵煎嚭")
+ @ManagerAuth(memo = "response.warehouse_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWhs> wrapper = new EntityWrapper<>();
@@ -125,7 +125,9 @@
public R query(@RequestBody JSONObject param) {
Wrapper<BasWhs> wrapper = new EntityWrapper<BasWhs>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != basWhsService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(BasWhs.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(BasWhs.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
--
Gitblit v1.9.1