From d29f311349e03ca0b57763b962460c8ef114ca66 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 03 十一月 2024 18:23:16 +0800
Subject: [PATCH] 授予角色权限不校验上级权限

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 5eb61b3..1cff29d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -101,10 +101,11 @@
 //            }
 
             Date now = new Date();
-            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrkNo", wrkMast.getWrkNo()));
+            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
             WrkMastLog wrkMastLog = new WrkMastLog();
             wrkMastLog.sync(wrkMast1);
             wrkMastLog.setModiTime(now);
+            wrkMastLog.setWrkSts(wrkMast1.getWrkSts().intValue());
             if (!wrkMastLogService.insert(wrkMastLog)){
                 exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
             }
@@ -114,7 +115,7 @@
                 exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
             }
             // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
-            List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrkNo", wrkMast.getWrkNo()));
+            List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
             wrkDetls1.forEach( wrkDetl -> {
                 WrkDetlLog wrkDetlLog = new WrkDetlLog();
                 wrkDetlLog.sync(wrkDetl);
@@ -129,7 +130,7 @@
 //            }
             // 鍒犻櫎宸ヤ綔鏄庣粏妗�
             if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
-//                exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+                exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
             }
         } catch (Exception e) {
             log.error("fail", e);

--
Gitblit v1.9.1