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 map = new HashMap<>(); - map.put("site", data.getSite()); - map.put("rule_no", data.getRuleNo()); - List list = authRuleMapper.selectByMap(map); - if (list.size() > 0) { - throw new RuntimeException("该site下已存在相同的审批规则"); - } +// Map map = new HashMap<>(); +// map.put("site", data.getSite()); +// map.put("bu_no", data.getBuNo()); +// map.put("rule_no", data.getRuleNo()); +// List 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 @@ AND active = #{query.active} + + AND priority = #{query.priority} + ORDER BY id DESC