Merge remote-tracking branch 'origin/test-merge' into test-merge

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

@@ -52,4 +52,6 @@ public class ExcelTabVO extends ExcelTab {
     @ApiModelProperty(value = "清表使用数量")
     private Integer excelUseNumber;
 
+    @ApiModelProperty(value = "创建人名称")
+    private String createUserName;
 }

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

@@ -82,4 +82,7 @@ public interface ExcelTabMapper extends BaseMapper<ExcelTab> {
     List<WbsFormElement> getUnMatchField(@Param("tabId") Long tabId, @Param("set") Set<String> set);
 
     List<ExcelTabVO> selectRootExcelTab(IPage<ExcelTabVO> page, @Param("projectId") Long projectId,@Param("rootIds") Collection<Long> rootIds);
+
+    @Select("select *, (select name from blade_user where id = a.create_user) as createUserName from m_excel_tab a where id = #{id}")
+    ExcelTabVO getById(Long id);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -186,12 +186,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
     @Override
     public ExcelTabVO templateDetail(Long id) {
-        ExcelTab detail = this.getById(id);
-        if (detail == null) {
-            return new ExcelTabVO();
-        }
-        ExcelTabVO excelTabVO = ExcelTabWrapper.build().entityVO(detail);
-        if (detail.getParentId() != null && detail.getParentId() > 0) {
+        ExcelTabVO excelTabVO = this.baseMapper.getById(id);
+        if (excelTabVO == null || (excelTabVO.getParentId() != null && excelTabVO.getParentId() > 0)) {
             return excelTabVO;
         }
         Map<String, Object> map = jdbcTemplate.queryForMap("SELECT count(a.id) as total,count(t.id) as useNum from m_excel_tab a LEFT JOIN ( select excel_id as id from m_wbs_tree_private where type = 2 and is_deleted = 0 and excel_id is not null GROUP BY excel_id ) as t " +