Commit d209d7e8 by liuyang

修复文档管理编辑目录bug

parent bf5f384b
...@@ -17,6 +17,7 @@ import com.baosight.hggp.hg.wd.domain.HGWD001A; ...@@ -17,6 +17,7 @@ import com.baosight.hggp.hg.wd.domain.HGWD001A;
import com.baosight.hggp.hg.wd.domain.HGWD099; import com.baosight.hggp.hg.wd.domain.HGWD099;
import com.baosight.hggp.hg.wd.tools.HGWDTools; import com.baosight.hggp.hg.wd.tools.HGWDTools;
import com.baosight.hggp.hg.xs.domain.Org; import com.baosight.hggp.hg.xs.domain.Org;
import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.CommonMethod; import com.baosight.hggp.util.CommonMethod;
import com.baosight.hggp.util.EiInfoUtils; import com.baosight.hggp.util.EiInfoUtils;
import com.baosight.hggp.util.LogUtils; import com.baosight.hggp.util.LogUtils;
...@@ -78,6 +79,7 @@ public class ServiceHGWD001F extends ServiceEPBase { ...@@ -78,6 +79,7 @@ public class ServiceHGWD001F extends ServiceEPBase {
hgwd001.fromMap(resultRow); hgwd001.fromMap(resultRow);
hgwd001.setStatus(HgWdConstant.FileStatus.S_0); hgwd001.setStatus(HgWdConstant.FileStatus.S_0);
if (wd001 == null){ if (wd001 == null){
AssertUtils.isEmpty(Collections.singleton(hgwd001), "项目编号不能为空");
String filePath = setFilePath(hgsc001,edcm01Map.get("app.sc.projectSource")); String filePath = setFilePath(hgsc001,edcm01Map.get("app.sc.projectSource"));
hgwd001.setFilePath(filePath+"/"+hgwd001.getFileName()); hgwd001.setFilePath(filePath+"/"+hgwd001.getFileName());
}else { }else {
...@@ -157,7 +159,7 @@ public class ServiceHGWD001F extends ServiceEPBase { ...@@ -157,7 +159,7 @@ public class ServiceHGWD001F extends ServiceEPBase {
.filter(map -> !hgwd001.getFileId().equals(map.get(HGWD001.FIELD_FILE_ID))) .filter(map -> !hgwd001.getFileId().equals(map.get(HGWD001.FIELD_FILE_ID)))
.map(map -> map.get(HGWD001.FIELD_FILE_ID).toString()).collect(Collectors.toList()); .map(map -> map.get(HGWD001.FIELD_FILE_ID).toString()).collect(Collectors.toList());
List<HGWD099> hgwd099List = HGWDTools.HgWd099.queryByBiz("WD",childFileIdList); List<HGWD099> hgwd099List = HGWDTools.HgWd099.queryByBiz("WD",childFileIdList);
Map<String, List<HGWD099>> listMap = hgwd099List.stream().collect(Collectors.groupingBy(HGWD099::getBizId,Collectors.toList())); Map<String, List<HGWD099>> listMap = Optional.ofNullable(hgwd099List).orElse(new ArrayList<>()).stream().collect(Collectors.groupingBy(HGWD099::getBizId,Collectors.toList()));
int end = wd001out.getFilePath().length()+1; int end = wd001out.getFilePath().length()+1;
if (childList != null && childList.size() > 0) { if (childList != null && childList.size() > 0) {
for (Map child : childList) { for (Map child : childList) {
......
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