资料填报，资料排序

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -38,33 +38,33 @@ public class WbsTreeContractController extends BladeController {
     @ApiOperation(value = "查询当前节点下所有元素表信息", notes = "传入节点primaryKeyId、type、合同段id、项目id")
     public R searchNodeAllTable(String primaryKeyId, String type, String contractId, String projectId) {
         List<AppWbsTreeContractVO> list = iWbsTreeContractService.searchNodeAllTable(primaryKeyId, type, contractId, projectId);
-        boolean flag = false;
-        Set<Long> l1 = new HashSet<>();
-        for (AppWbsTreeContractVO vo : list) {
-            if (vo.getNodeName().contains("_PL_")){
-                l1.add(vo.getId());
-                flag = true;
-            }
-        }
-        if (flag){
-            for (Long aLong : l1) {
-                List<AppWbsTreeContractVO> vos = new ArrayList<>();
-                for (AppWbsTreeContractVO vo : list) {
-                    if (aLong.equals(vo.getId())){
-                        vos.add(vo);
-                    }
-                }
-                list = list.stream().filter(l -> {
-                    if (l.getId().equals(aLong)){
-                        return false;
-                    }else {
-                        return true;
-                    }
-                }).collect(Collectors.toList());
-                vos = vos.stream().sorted(Comparator.comparing(AppWbsTreeContractVO::getPKeyId)).collect(Collectors.toList());
-                list.addAll(vos);
-            }
-        }
+//        boolean flag = false;
+//        Set<Long> l1 = new HashSet<>();
+//        for (AppWbsTreeContractVO vo : list) {
+//            if (vo.getNodeName().contains("_PL_")){
+//                l1.add(vo.getId());
+//                flag = true;
+//            }
+//        }
+//        if (flag){
+//            for (Long aLong : l1) {
+//                List<AppWbsTreeContractVO> vos = new ArrayList<>();
+//                for (AppWbsTreeContractVO vo : list) {
+//                    if (aLong.equals(vo.getId())){
+//                        vos.add(vo);
+//                    }
+//                }
+//                list = list.stream().filter(l -> {
+//                    if (l.getId().equals(aLong)){
+//                        return false;
+//                    }else {
+//                        return true;
+//                    }
+//                }).collect(Collectors.toList());
+//                vos = vos.stream().sorted(Comparator.comparing(AppWbsTreeContractVO::getPKeyId)).collect(Collectors.toList());
+//                list.addAll(vos);
+//            }
+//        }
         if (list.size() > 0) {
             list.stream().forEach(l->{
                 if (StringUtils.isNotBlank(l.getHtmlUrl())){

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -426,7 +426,7 @@
                 #{tableOwnerList}
             </foreach>
         </if>
-        ORDER BY sort,node_name,create_time
+        ORDER BY full_name,p_key_id,update_time
     </select>
 
     <select id="selectRoleInfo" resultType="org.springblade.manager.entity.SaveUserInfoByProject">