Merge branch 'joke' into 'master'

杭州-首页点击中间件跳转到业务资源页面去除所属资源池

杭州-首页点击中间件跳转到业务资源页面去除所属资源池

See merge request !149

@@ -142,7 +142,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
                     , done: function (res) {
                     , done: function (res) {
                         soulTable.render(this);
                         soulTable.render(this);
                         getResCount(bizId, newResType)
                         getResCount(bizId, newResType)
-
                         commonCols.colsClickEvent();
                         commonCols.colsClickEvent();
 
 
                         table.on('sort(bizResListTable)', function (obj) {
                         table.on('sort(bizResListTable)', function (obj) {
@@ -173,7 +172,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
 
 
         //树表格
         //树表格
         function renderTreeTable(bizId, resType, reloadFlag) {
         function renderTreeTable(bizId, resType, reloadFlag) {
-
             $(".biz_reslist_search").hide();
             $(".biz_reslist_search").hide();
             $(".biz_reslist_treetable_search").show();
             $(".biz_reslist_treetable_search").show();
             $("#bizResListTableContent").hide();
             $("#bizResListTableContent").hide();
@@ -518,6 +516,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             }
             }
 
 
             if (resType == 'MIDDLEWARE_WEBLOGIC') {
             if (resType == 'MIDDLEWARE_WEBLOGIC') {
+                $("#biz_reslist_res_colony_id").hide();
                 $("#biz_reslist_link_state_id").hide();
                 $("#biz_reslist_link_state_id").hide();
                 $('#biz_reslist_server_state_id').show();
                 $('#biz_reslist_server_state_id').show();
             } else {
             } else {
@@ -527,7 +526,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             if (targetId && searchType) {
             if (targetId && searchType) {
                 var url = "/api-web/home/res-list/" + searchType + "?page=1&limit=50&busId=" + bizId;
                 var url = "/api-web/home/res-list/" + searchType + "?page=1&limit=50&busId=" + bizId;
                 if (searchType == 'MIDDLEWARE_WEBLOGIC') {
                 if (searchType == 'MIDDLEWARE_WEBLOGIC') {
-                    url += '&parentId=null'
+                    //增加parentType=parent,解决sql查询中问题  joke add 20211130
+                    url += '&parentId=null&parentType=parent';
                 }
                 }
                 admin.req({
                 admin.req({
                     url: common.domainName + url
                     url: common.domainName + url