Commit 3fa811ad by “zcwang”

modify: 导出字段优化

parent 32019117
Pipeline #44750 passed with stages
in 2 minutes 4 seconds
...@@ -127,7 +127,7 @@ public class ChangeFlowExportCallback implements DesCallbackService { ...@@ -127,7 +127,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq(); ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq();
BeanUtils.copyProperties(query, changeFlowListQueryReq); BeanUtils.copyProperties(query, changeFlowListQueryReq);
List<ChangeRecord> changeRecords = changeRecordMapper.selectByConditionAndLimit(changeFlowListQueryReq); List<ChangeRecord> changeRecords = changeRecordMapper.selectByConditionAndLimit(changeFlowListQueryReq);
log.debug("[getExportList] changeRecords:{}", changeRecords); log.debug("[getExportList] changeRecords:{}", JSON.toJSONString(changeRecords));
if (CollectionUtils.isEmpty(changeRecords)) { if (CollectionUtils.isEmpty(changeRecords)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
...@@ -138,7 +138,6 @@ public class ChangeFlowExportCallback implements DesCallbackService { ...@@ -138,7 +138,6 @@ public class ChangeFlowExportCallback implements DesCallbackService {
List<String> allQueryDepartmentList = new ArrayList<>(); List<String> allQueryDepartmentList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(creatorList)) { if (CollectionUtils.isNotEmpty(creatorList)) {
allQueryDepartmentList.addAll(creatorList); allQueryDepartmentList.addAll(creatorList);
} }
List<String> changeCommanderList = changeRecords.stream().map(ChangeRecord::getChangeCommander).collect(Collectors.toList()); List<String> changeCommanderList = changeRecords.stream().map(ChangeRecord::getChangeCommander).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(changeCommanderList)) { if (CollectionUtils.isNotEmpty(changeCommanderList)) {
...@@ -148,7 +147,7 @@ public class ChangeFlowExportCallback implements DesCallbackService { ...@@ -148,7 +147,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
if (CollectionUtils.isNotEmpty(allQueryDepartmentList)) { if (CollectionUtils.isNotEmpty(allQueryDepartmentList)) {
// 查询创建人部门名 // 查询创建人部门名
IusDepartmentReq iusDepartmentReq = new IusDepartmentReq(); IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
iusDepartmentReq.setUids(new ArrayList<>(creatorList)); iusDepartmentReq.setUids(new ArrayList<>(allQueryDepartmentList));
iusDepartmentReq.setIcac(true); iusDepartmentReq.setIcac(true);
orgMap = iusService.queryDepartment(iusDepartmentReq); orgMap = iusService.queryDepartment(iusDepartmentReq);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment