rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 填充信息

This commit is contained in:
曹鹏飞 2024-04-23 10:58:44 +08:00
parent b1c757938b
commit a1666c26b4
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -2089,6 +2089,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
Page<BomNewEbomParentVO> result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage(), query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode()); Page<BomNewEbomParentVO> result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage(), query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode());
if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isBlank(query.getDrawingNo())) { if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isBlank(query.getDrawingNo())) {
//列表搜索 //列表搜索
materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
return result; return result;
} }
//根据编号或图号搜索 //根据编号或图号搜索
@ -2119,6 +2120,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
results.sort((r1, r2) -> r1.getBomRowId() >= r2.getBomRowId() ? r1.getBomRowId() > r2.getBomRowId() ? 1 : 0 : -1); results.sort((r1, r2) -> r1.getBomRowId() >= r2.getBomRowId() ? r1.getBomRowId() > r2.getBomRowId() ? 1 : 0 : -1);
materialMainService.intiMaterialInfo(results, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
Page<BomNewEbomParentVO> pageResult = new Page<>(); Page<BomNewEbomParentVO> pageResult = new Page<>();
pageResult.setPages(1); pageResult.setPages(1);
pageResult.setCurrent(1); pageResult.setCurrent(1);