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/WrkMastController.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 318128d..e85d9b9 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -70,7 +70,7 @@
     }
 
     @RequestMapping(value = "/wrkMast/add/auth")
-    @ManagerAuth(memo = "宸ヤ綔妗f坊鍔�")
+    @ManagerAuth(memo = "response.wrk_mast_add")
     public R add(WrkMast wrkMast) {
         wrkMast.setModiUser(getUserId());
         wrkMast.setModiTime(new Date());
@@ -81,7 +81,7 @@
     }
 
 	@RequestMapping(value = "/wrkMast/update/auth")
-	@ManagerAuth(memo = "宸ヤ綔妗d慨鏀�")
+	@ManagerAuth(memo = "response.wrk_mast_update")
     public R update(WrkMast wrkMast){
         if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
             return R.error();
@@ -93,7 +93,7 @@
     }
 
     @RequestMapping(value = "/wrkMast/delete/auth")
-    @ManagerAuth(memo = "宸ヤ綔妗e垹闄�")
+    @ManagerAuth(memo = "response.wrk_mast_delete")
     public R delete(@RequestParam String param){
         List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
         if (Cools.isEmpty(list)){
@@ -106,7 +106,7 @@
     }
 
     @RequestMapping(value = "/wrkMast/export/auth")
-    @ManagerAuth(memo = "宸ヤ綔妗e鍑�")
+    @ManagerAuth(memo = "response.wrk_mast_export")
     public R export(@RequestBody JSONObject param){
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
@@ -137,16 +137,18 @@
     public R query(@RequestBody JSONObject param) {
         Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
         if (null != wrkMastService.selectOne(wrapper)){
-            return R.parse(BaseRes.REPEAT).add(getComment(WrkMast.class, String.valueOf(param.get("key"))));
+            R r = R.parse(BaseRes.REPEAT);
+            r.put("data", getComment(WrkMast.class, String.valueOf(param.get("key"))));
+            return r;
         }
         return R.ok();
     }
 
     @RequestMapping(value = "/wrkMast/add/pri/auth")
-    @ManagerAuth(memo = "宸ヤ綔妗e鍔犱紭鍏堢骇")
+    @ManagerAuth(memo = "response.wrk_mast_add_pri")
     public R addPri(@RequestBody List<WrkMast> list) {
         if (list.isEmpty()) {
-            return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+            return R.error("response.select_at_least_one_merge_data");
         }
         for (WrkMast entity : list){
            entity.setIoPri(entity.getIoPri() + 1);
@@ -156,10 +158,10 @@
     }
 
     @RequestMapping(value = "/wrkMast/red/pri/auth")
-    @ManagerAuth(memo = "宸ヤ綔妗i檷浣庝紭鍏堢骇")
+    @ManagerAuth(memo = "response.wrk_mast_red_pri")
     public R redPri(@RequestBody List<WrkMast> list) {
         if (list.isEmpty()) {
-            return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+            return R.error("response.select_at_least_one_merge_data");
         }
         for (WrkMast entity : list){
             entity.setIoPri(entity.getIoPri() - 1);

--
Gitblit v1.9.1