From 4864c87d65e797d2ecd827b1eca9d46aec0950aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
index d19e690..35ae470 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
@@ -87,7 +87,6 @@
@SuppressWarnings("unused") ToolsClassify toolsClassify = new ToolsClassify();
List<CommonGenericTree> list = new ArrayList<>();
Map<String, CommonGenericTree> map = new HashMap<>();
- CommonGenericTree<ToolsClassify> node = new CommonGenericTree<>();
if (CollectionUtils.isNotEmpty(toolsClassifyList)) {
CommonGenericTree<ToolsClassify> tcNode;
CommonGenericTree<ToolsClassify> childNode;
@@ -102,7 +101,7 @@
tcNode.setValue(tc.getId());
tcNode.setDisabled(CommonConstant.STATUS_0.equals(tc.getStatus()) ? true : false);
tcNode.setRField1(tc.getClassifyId());
- tcNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
+ //tcNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
tcNode.setEntity(tc);
list.add(tcNode);
map.put(tc.getId(), tcNode);
@@ -117,7 +116,7 @@
childNode.setValue(tc.getId());
childNode.setDisabled(CommonConstant.STATUS_0.equals(tc.getStatus()) ? true : false);
childNode.setRField1(tc.getClassifyId());
- childNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
+ //childNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
childNode.setEntity(tc);
tcNode.addChildren(childNode);
map.put(child.getId(), childNode);
@@ -248,6 +247,7 @@
.setTypeName(name)
.setStatus("1")
.setLeafFlag(leafFlag)
+ .setEncodingType("3")
.setSeq(seq)
.setParentId(toolsClassify.getId())
.setParaTypeFlag(paraTypeFlag);
@@ -257,6 +257,7 @@
.setTypeName(name)
.setStatus("1")
.setLeafFlag(leafFlag)
+ .setEncodingType("3")
.setSeq(seq)
.setParentId(toolsClassify.getId())
.setParaTypeFlag(paraTypeFlag);
@@ -273,6 +274,7 @@
.setTypeName(name)
.setStatus("1")
.setLeafFlag(leafFlag)
+ .setEncodingType("3")
.setSeq(seq)
.setParentId("-1")
.setParaTypeFlag(paraTypeFlag);
@@ -284,6 +286,7 @@
.setParentId("-1")
.setSeq(seq)
.setLeafFlag(leafFlag)
+ .setEncodingType("3")
.setParaTypeFlag(paraTypeFlag);
this.save(newToolsClassify);
}
--
Gitblit v1.9.3