From 145a14583ff700f73e4c750079d13279006847c9 Mon Sep 17 00:00:00 2001
From: xuyuxiang <YJLP2014>
Date: Wed, 31 Mar 2021 14:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B3=A8=E9=87=8A=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modular/menu/enums/SysMenuExceptionEnum.java     | 9 +++++++--
 .../sys/modular/org/enums/SysOrgExceptionEnum.java       | 9 +++++++--
 .../modular/timer/service/impl/SysTimersServiceImpl.java | 2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/menu/enums/SysMenuExceptionEnum.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/menu/enums/SysMenuExceptionEnum.java
index b0c2196d..0bba471b 100644
--- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/menu/enums/SysMenuExceptionEnum.java
+++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/menu/enums/SysMenuExceptionEnum.java
@@ -89,9 +89,14 @@ public enum SysMenuExceptionEnum implements AbstractBaseExceptionEnum {
     CANT_MOVE_APP(10, "父节点不是根节点不能移动应用"),
 
     /**
-     * 父级菜单不能为当前节点，请从新选择父级菜单
+     * 父级菜单不能为当前节点，请重新选择父级菜单
      */
-    PID_CANT_EQ_ID(11, "父级菜单不能为当前节点，请从新选择父级菜单");
+    PID_CANT_EQ_ID(11, "父级菜单不能为当前节点，请重新选择父级菜单"),
+
+    /**
+     * 父节点不能为本节点的子节点，请重新选择父节点
+     */
+    PID_CANT_EQ_CHILD_ID(6, "父节点不能为本节点的子节点，请重新选择父节点");
 
     private final Integer code;
 
diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/org/enums/SysOrgExceptionEnum.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/org/enums/SysOrgExceptionEnum.java
index ed70a00f..314fbfab 100644
--- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/org/enums/SysOrgExceptionEnum.java
+++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/org/enums/SysOrgExceptionEnum.java
@@ -59,9 +59,14 @@ public enum SysOrgExceptionEnum implements AbstractBaseExceptionEnum {
     ORG_CANNOT_DELETE(4, "该机构下有员工，无法删除"),
 
     /**
-     * 父节点不能和本节点一致，请从新选择父节点
+     * 父节点不能和本节点一致，请重新选择父节点
      */
-    ID_CANT_EQ_PID(5, "父节点不能和本节点一致，请从新选择父节点");
+    ID_CANT_EQ_PID(5, "父节点不能和本节点一致，请重新选择父节点"),
+
+    /**
+     * 父节点不能为本节点的子节点，请重新选择父节点
+     */
+    PID_CANT_EQ_CHILD_ID(6, "父节点不能为本节点的子节点，请重新选择父节点");
 
     private final Integer code;
 
diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/timer/service/impl/SysTimersServiceImpl.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/timer/service/impl/SysTimersServiceImpl.java
index 0c6581c6..7aea7c2b 100644
--- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/timer/service/impl/SysTimersServiceImpl.java
+++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/timer/service/impl/SysTimersServiceImpl.java
@@ -143,7 +143,7 @@ public class SysTimersServiceImpl extends ServiceImpl<SysTimersMapper, SysTimers
         // 查看被编辑的任务的状态
         Integer jobStatus = oldTimer.getJobStatus();
 
-        // 如果任务正在运行，则停掉这个任务，从新运行任务
+        // 如果任务正在运行，则停掉这个任务，重新运行任务
         if (jobStatus.equals(TimerJobStatusEnum.RUNNING.getCode())) {
             CronUtil.remove(String.valueOf(oldTimer.getId()));
             timerExeService.startTimer(