From 7bc1d0f521c1d59246f29bcadcc4343f88ceef1c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 15 九月 2025 11:29:30 +0800
Subject: [PATCH] 性能优化+bug调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 2a2c008..2c207eb 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -18,6 +18,7 @@
import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
+import java.util.Comparator;
import java.util.List;
/**
@@ -90,6 +91,39 @@
ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(ncNodeVO.getProcessInstanceId()));
}
}
+ //鏂囦欢锛屾寜鐓у厛绋嬪簭锛屽悗鍏朵粬鎺掑簭
+ if(list.get(0).getNodeType().equals(NcNode.TYPE_PROGRAM_FILE)){
+ NcNode parentNode = ncNodeService.getById(parentId);
+ //list.sort(Comparator.comparing().thenComparing(NcNodeVO::getName));
+ Comparator<NcNodeVO> cp = new Comparator<NcNodeVO>() {
+ @Override
+ public int compare(NcNodeVO n1, NcNodeVO n2) {
+ if (n1.getName().startsWith(parentNode.getName()) && !n2.getName().startsWith(parentNode.getName())) {
+ return -1;
+ } else {
+ return 1;
+ }
+ }
+ };
+ list.sort(cp.thenComparing(NcNodeVO::getName));
+ /*
+ list.sort((n1, n2) -> {
+
+ if(n1.getName().startsWith(parentNode.getName())){
+ return 1;
+ }else{
+ return n1.getName().compareTo(n2.getName());
+ }
+
+ });*/
+ /*
+ Collections.sort(userList, new Comparator<User>() {
+ @Override
+ public int compare(User u1, User u2) {
+ return u1.getName().compareTo(u2.getName());
+ }
+ });*/
+ }
}
return R.data(list);
}
--
Gitblit v1.9.3