wbs动态库项目搜索

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsNodeTableVO.java

@@ -92,5 +92,6 @@ public class WbsNodeTableVO implements Serializable {
     private String htmlUrl;
 
     private String nodeType;
+    private Integer wbsType;
 
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreePrivateTableVO.java

@@ -22,8 +22,6 @@ public class WbsTreePrivateTableVO  implements Serializable {
     @ApiModelProperty(value = "标题")
     private String title;
 
-    private Integer sort;
-
     @ApiModelProperty(value = "表单list")
     List<WbsNodeTableVO> list;
 

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

@@ -400,13 +400,7 @@ public class WbsTreePrivateController extends BladeController {
         List<WbsNodeTableVO> data = r.getData();
         List<WbsTreePrivateTableVO> list = new ArrayList<>();
         if (data != null && !data.isEmpty()) {
-            Integer wbsType = null;
-            if (StringUtil.isNumeric(wbsId)) {
-                List<WbsInfo> query = jdbcTemplate.query("select id, wbs_type from m_wbs_info where is_deleted = 0 and id = " + Long.parseLong(wbsId), new BeanPropertyRowMapper<>(WbsInfo.class));
-                if (!query.isEmpty()) {
-                    wbsType = query.get(0).getWbsType();
-                }
-            }
+            Integer wbsType = data.get(0).getWbsType();
             Map<Integer, List<WbsNodeTableVO>> groupMap;
             if (wbsType != null && wbsType == 1) {
                 groupMap = data.stream().collect(Collectors.groupingBy(vo -> {

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

@@ -519,6 +519,7 @@
                wt.sort,
                wt.status,
                wt.node_type                                                                         AS nodeType,
+               wt.wbs_type                                                                          AS wbsType,
                wt.fill_rate                                                                         AS "fillRate",
                wt.html_url                                                                          AS htmlUrl,
                (SELECT count(1)