导出BUGFIX

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -333,15 +333,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             String fieldName = field.getName();
             field.setAccessible(true);
             String underscoreFieldName = StringUtils.camelToUnderline(fieldName).toUpperCase();
-            Object value;
+            Object value = null;
             try {
                 value = field.get(object);
                 // 需要转为jsonArray的字段
                 if (!ValidationUtil.isEmpty(strToJsonArrayFields) && Arrays.asList(strToJsonArrayFields).contains(underscoreFieldName) && value instanceof String) {
                     value = JSON.parse((String) field.get(object));
                 }
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
+            } catch (Exception e) {
+                log.warn("JSON转化失败：{}",e.getMessage());
             }
             if (!ValidationUtil.isEmpty(value)) {
                 result.put(underscoreFieldName.toUpperCase(), value);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTableDataExportServiceImpl.java

@@ -844,7 +844,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
             int totalPage = (int) Math.ceil((double) pageResult.getTotal() / PAGE_SIZE);
             List<CompletableFuture<List<String>>> futures = new ArrayList<>();
             List<String> idsCollected = pageResult.getRecords().stream()
-                    .map(item -> isAdmin ? item.getOrDefault("uid", null) : item.getOrDefault("sequenceNbr", null))
+                    .map(item -> item.getOrDefault("sequenceNbr", null))
                     .filter(Objects::nonNull)
                     .map(String::valueOf)
                     .collect(Collectors.toList());
@@ -857,7 +857,7 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
                             tcmServiceFeignClient.page(String.valueOf(pageIndex), String.valueOf(PAGE_SIZE), null, map);
                     Page<Map<String, String>> resultPage = page1.getResult();
                     return resultPage.getRecords().stream()
-                            .map(item -> isAdmin ? item.getOrDefault("uid", null) : item.getOrDefault("sequenceNbr", null))
+                            .map(item -> item.getOrDefault("sequenceNbr", null))
                             .filter(Objects::nonNull)
                             .map(String::valueOf)
                             .collect(Collectors.toList());