From ac17706fc79bf5df8371c68c9856491363c51add Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 8 Apr 2024 10:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8E=BB=E6=8E=89=E5=81=9C=E7=94=A8=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=8B=E7=BA=A7=E7=9A=84=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=94=AF=E6=8C=81=E7=BA=A7=E8=81=94=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/web/DictDataController.java        | 14 +++++++-------
 .../resources/views/modules/sys/dictDataForm.html  |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java
index 7e6b22af..edd8e683 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/DictDataController.java
@@ -185,13 +185,13 @@ public class DictDataController extends BaseController {
 		if (old != null && Global.YES.equals(old.getIsSys()) && !dictData.currentUser().isSuperAdmin()){
 			return renderResult(Global.FALSE, text("越权操作，只有超级管理员才能修改系统数据！"));
 		}
-		DictData where = new DictData();
-		where.setStatus(DictData.STATUS_NORMAL);
-		where.setParentCodes("," + dictData.getId() + ",");
-		long count = dictDataService.findCount(where);
-		if (count > 0) {
-			return renderResult(Global.FALSE, text("该字典包含未停用的子字典！"));
-		}
+//		DictData where = new DictData();
+//		where.setStatus(DictData.STATUS_NORMAL);
+//		where.setParentCodes("," + dictData.getId() + ",");
+//		long count = dictDataService.findCount(where);
+//		if (count > 0) {
+//			return renderResult(Global.FALSE, text("该字典包含未停用的子字典！"));
+//		}
 		dictData.setStatus(DictData.STATUS_DISABLE);
 		dictDataService.updateStatus(dictData);
 		return renderResult(Global.TRUE, text("停用字典成功"));
diff --git a/modules/core/src/main/resources/views/modules/sys/dictDataForm.html b/modules/core/src/main/resources/views/modules/sys/dictDataForm.html
index dd94e90e..f7c961d1 100644
--- a/modules/core/src/main/resources/views/modules/sys/dictDataForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/dictDataForm.html
@@ -142,7 +142,8 @@ $('#inputForm').validate({
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
 				js.closeCurrentTabPage(function(contentWindow){
-					contentWindow.page();
+					(contentWindow.win||contentWindow).$('#dataGrid').dataGrid('refreshTreeChildren',
+							$('#parentCode').val(), '${dictData.id}');
 				});
 			}
 		}, "json");