Merge remote-tracking branch 'origin/master'

lyh

2025-06-25 4864c87d65e797d2ecd827b1eca9d46aec0950aa

 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);
                    }