Merge remote-tracking branch 'origin/master' into master

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

@@ -1976,6 +1976,22 @@ public class ExcelTabController extends BladeController {
                     resultMapList.add(reData);
                 }
             }
+        }else {
+            WbsTreePrivate node = this.wbsTreePrivateService.getOne(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getPKeyId, nodePrimaryKeyId));
+            WbsTreePrivate tableNode = this.wbsTreePrivateService.getOne(Wrappers.<WbsTreePrivate>lambdaQuery()
+                    .eq(WbsTreePrivate::getParentId, node.getId()).eq(WbsTreePrivate::getProjectId,node.getProjectId()));
+            Map<String, Object> reData = new HashMap<>();
+            // 获取默认值
+            QueryWrapper<TextdictInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("type", 4);
+            queryWrapper.eq("tab_id", tableNode.getPKeyId());
+            final List<TextdictInfo> textdictInfos = textdictInfoService.getBaseMapper().selectList(queryWrapper);
+            if (!textdictInfos.isEmpty()) {
+                for (TextdictInfo textdictInfo : textdictInfos) {
+                    reData.put(textdictInfo.getColKey() + "", textdictInfo.getSigRoleName());
+                }
+                resultMapList.add(reData);
+            }
         }