diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 93a4db427..2623a233d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -65,6 +65,7 @@ public class SarFileCompareInfoController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); queryWrapper.eq("create_by", sysUser.getUsername()).or().eq("release_state", ReleaseConditionEnum.PUBLISHED.getValue()); + queryWrapper.orderByAsc("create_by"); Page page = new Page<>(pageNo, pageSize); IPage pageList = sarFileCompareInfoService.page(page, queryWrapper); for (SarFileCompareInfo info : pageList.getRecords()) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index 732a8c6b1..f0d77ba71 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.compare.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.compare.entity.*; import com.jero.modules.compare.mapper.SarFileCompareInfoMapper; @@ -9,6 +10,7 @@ import com.jero.modules.compare.service.ISarFileCompareMenuService; import com.jero.modules.compare.utils.CompHanLPUtils; import com.jero.modules.compare.utils.CompareConst; import com.jero.modules.docTranslation.enums.ReleaseConditionEnum; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; @@ -44,6 +46,9 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(leftInfo.getSerialNumber()); + if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { + sarFileCompareInfo.setFileKeyLeft(bussDocumentLibraryEOList.get(0).get("id").toString()); + } sarFileCompareInfo.setFileNameLeft(leftInfo.getFileName()); sarFileCompareInfo.setTitleLeft(leftInfo.getTitle()); sarFileCompareInfo.setFileTypeLeft(leftInfo.getFileType()); sarFileCompareInfo.setSerialNumberLeft(leftInfo.getSerialNumber()); sarFileCompareInfo.setFileIdRight(rightInfo.getId()); + // 处理文档库id字段 根据编号和标题查询 + List> bussDocumentLibraryEOList1 = bussDocumentLibraryEOService.getListBySerialNumber(rightInfo.getSerialNumber()); + if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList1)) { + sarFileCompareInfo.setFileKeyRight(bussDocumentLibraryEOList1.get(0).get("id").toString()); + } sarFileCompareInfo.setFileKeyRight(rightInfo.getConnectId()); sarFileCompareInfo.setFileNameRight(rightInfo.getFileName()); sarFileCompareInfo.setFileTypeRight(rightInfo.getFileType());