From 6c67d5d207c733f550cefee2968fb8cc0df4485b Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Tue, 18 Jun 2024 20:25:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ERP=E5=95=86=E5=93=81=E6=9D=A1=E5=BD=A2?=
 =?UTF-8?q?=E7=A0=81=E5=A4=8D=E5=88=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp/src/main/resources/template/js/materialCode/batchCopy.js    | 2 +-
 .../main/resources/template/js/sysEveRole/sysEveRoleAppMenu.js  | 2 +-
 .../main/resources/template/js/sysEveRole/sysEveRolePCMenu.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/erp/src/main/resources/template/js/materialCode/batchCopy.js b/erp/src/main/resources/template/js/materialCode/batchCopy.js
index 30102a8cd..96bf39a2d 100644
--- a/erp/src/main/resources/template/js/materialCode/batchCopy.js
+++ b/erp/src/main/resources/template/js/materialCode/batchCopy.js
@@ -56,7 +56,7 @@ layui.config({
             let params = {
                 materialId: $("#materialId").val(),
                 normsId: $("#normsId").val(),
-                inDepot: dataShowType.getData('inDepot'),
+                inDepot: isNull(dataShowType.getData('inDepot')) ? '' : dataShowType.getData('inDepot'),
                 number: $("#number").val(),
                 limit: $("#number").val(),
                 depotId: $("#depotId").val(),
diff --git a/userauth/src/main/resources/template/js/sysEveRole/sysEveRoleAppMenu.js b/userauth/src/main/resources/template/js/sysEveRole/sysEveRoleAppMenu.js
index 2f00e842e..6fd092365 100644
--- a/userauth/src/main/resources/template/js/sysEveRole/sysEveRoleAppMenu.js
+++ b/userauth/src/main/resources/template/js/sysEveRole/sysEveRoleAppMenu.js
@@ -63,7 +63,7 @@ layui.config({
 		AjaxPostUtil.request({url: reqBasePath + "querySysRoleById", params: {id: id}, type: 'json', method: "GET", callback: function (json) {
 			$("#name").text(json.bean.name);
 			$("#remark").text(json.bean.remark);
-			checkeRows = json.bean.appMenuIds;
+			checkeRows = isNull(json.bean.appMenuIds) ? [] : json.bean.appMenuIds;
 
 			tree = fsTree.render({
 				id: "treeDemo",
diff --git a/userauth/src/main/resources/template/js/sysEveRole/sysEveRolePCMenu.js b/userauth/src/main/resources/template/js/sysEveRole/sysEveRolePCMenu.js
index c6f9801e9..e59fa05c1 100644
--- a/userauth/src/main/resources/template/js/sysEveRole/sysEveRolePCMenu.js
+++ b/userauth/src/main/resources/template/js/sysEveRole/sysEveRolePCMenu.js
@@ -45,7 +45,7 @@ layui.config({
 	AjaxPostUtil.request({url: reqBasePath + "querySysRoleById", params: {id: id}, type: 'json', method: "GET", callback: function (json) {
 		$("#name").text(json.bean.name);
 		$("#remark").text(json.bean.remark);
-		checkeRows = json.bean.menuIds;
+		checkeRows = isNull(json.bean.menuIds) ? [] : json.bean.menuIds;
 
 		tree = fsTree.render({
 			id: "treeDemo",
-- 
GitLab