模板列表添加创建人和创建时间

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java

@@ -267,7 +267,11 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
                 dto.setId(item.getId());
                 dto.setName(item.getName());
                 dto.setCreatedTime(item.getCreatedTime());
-                dto.setCreatedBy(staffInfo.getRealName());
+                CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), item.getCreatedBy());
+                if (null == staff) {
+                    throw new EpmetException("获取工作人员信息失败");
+                }
+                dto.setCreatedBy(staff.getRealName());
                 if (tokenDto.getUserId().equals(item.getCreatedBy())) {
                     dto.setIsSelf(NumConstant.ONE);
                 } else {
@@ -295,7 +299,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
 
     private void digui(Map<String, List<IcExportTemplateForExportResultDTO>> resultTemp, IcExportTemplateForExportResultDTO root, List<List<String>> headerList, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<IcCustomExportResultDTO.SqlColumn> hiddenSqlColumns, Set<String> hasExistColumnSet) {
         if (StringUtils.isNotBlank(root.getColumnName())) {
-            showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(),root.isSupportAdd(), root.getColumnName(),root.getOptionSourceType()));
+            showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(),root.isSupportAdd(), root.getColumnName(),root.getOptionSourceValue()));
             if (StringUtils.isNotBlank(root.getOptionSourceValue())&&root.getOptionSourceValue().contains(StrConstant.QUESTION_MARK)) {
                 String[] paramArr = root.getOptionSourceValue().split(StrConstant.QUESTION_MARK_TRANSFER)[NumConstant.ONE].split(StrConstant.AND_MARK);
                 //先remote中再添加 然后移除item中有的