FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
企标详情  属性字典查询为空时,使用其本身数值

See merge request LiuChao/foton-slrs-system-rest!359
This commit is contained in:
王夏晖
2022-01-07 10:33:37 +08:00
parent 8b7ea559f8 2e6ca96447
commit 3f6cb25ed7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+8 -2
View File
@@ -287,7 +287,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (null != page.getNowOrderBy()) { if (null != page.getNowOrderBy()) {
nowOrderFunc(page); nowOrderFunc(page);
} }
List<SarBussionessStand> getList = sarBussionessStandEODao.getSarBussionessStand(page); List<SarBussionessStand> getList = sarBussionessStandEODao.getSarBussionessStand(page);
attrInfoShowExport(getList); attrInfoShowExport(getList);
return getList; return getList;
@@ -830,7 +830,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
value = entry.getValue().toString(); value = entry.getValue().toString();
List<String> valArr = Arrays.asList(value.split(",")); List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr); value = dicTypeEODao.getDicNamesByCodes(valArr);
entry.setValue(value);
Optional.ofNullable(value)
.ifPresent(val->{
entry.setValue(val);
});
} }
} }
} }