From b719be6d49becb344302a2ca40a82841ca4a183e Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 26 Aug 2024 20:08:54 +0800
Subject: [PATCH] =?UTF-8?q?2024.8.26=20=E4=B8=89=E3=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8E=E5=8F=B0=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20=E5=9B=9B=E3=80=81=E5=AE=A1=E6=89=B9=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xujie/sys/common/utils/TaskUtils.java     |  8 ++++----
 .../auth/service/Impl/AuthRuleServiceImpl.java    | 15 ++++++++-------
 src/main/resources/mapper/auth/AuthRuleMapper.xml |  6 +++++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
index 901f2378..f2f9068b 100644
--- a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
+++ b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java
@@ -46,10 +46,10 @@ public class TaskUtils {
     }
 
     //添加未上传文件邮件通知定時任務
-    @Scheduled(cron = "${task.data.sendEmail}" )
-    public void sendEmail() throws MessagingException, UnsupportedEncodingException {
-        eamProjectService.sendEmail();
-    }
+//    @Scheduled(cron = "${task.data.sendEmail}" )
+//    public void sendEmail() throws MessagingException, UnsupportedEncodingException {
+//        eamProjectService.sendEmail();
+//    }
 
     /**
      * 读取Modbus数据
diff --git a/src/main/java/com/xujie/sys/modules/auth/service/Impl/AuthRuleServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/Impl/AuthRuleServiceImpl.java
index 5f243a42..68bbe189 100644
--- a/src/main/java/com/xujie/sys/modules/auth/service/Impl/AuthRuleServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/auth/service/Impl/AuthRuleServiceImpl.java
@@ -63,13 +63,14 @@ public class AuthRuleServiceImpl extends ServiceImpl<AuthRuleMapper, AuthRuleDat
 
     @Override
     public void authRuleEdit(AuthRuleData data) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("site", data.getSite());
-        map.put("rule_no", data.getRuleNo());
-        List<AuthRuleData> list = authRuleMapper.selectByMap(map);
-        if (list.size() > 0) {
-            throw new RuntimeException("该site下已存在相同的审批规则");
-        }
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("site", data.getSite());
+//        map.put("bu_no", data.getBuNo());
+//        map.put("rule_no", data.getRuleNo());
+//        List<AuthRuleData> list = authRuleMapper.selectByMap(map);
+//        if (list.size() > 0) {
+//            throw new RuntimeException("该site下已存在相同的审批规则");
+//        }
         data.setUpdateDate(new Date());
         authRuleMapper.updateById(data);
 
diff --git a/src/main/resources/mapper/auth/AuthRuleMapper.xml b/src/main/resources/mapper/auth/AuthRuleMapper.xml
index 16d9e9f9..a8bfa503 100644
--- a/src/main/resources/mapper/auth/AuthRuleMapper.xml
+++ b/src/main/resources/mapper/auth/AuthRuleMapper.xml
@@ -21,7 +21,8 @@
         create_by,
         create_date,
         update_by,
-        update_date
+        update_date,
+        CKT_MES_II_REAL.dbo.get_bu_desc(site,bu_no) as buDesc
         FROM
         auth_rule
         WHERE
@@ -39,6 +40,9 @@
         <if test="query.active != null and query.active != ''">
             AND active = #{query.active}
         </if>
+        <if test="query.priority != null and query.priority != ''">
+            AND priority = #{query.priority}
+        </if>
         ORDER BY id DESC
     </select>
 </mapper>