|
@@ -124,9 +124,6 @@ public class JobTask {
|
|
|
SysDept dept = new SysDept();
|
|
SysDept dept = new SysDept();
|
|
|
dept.setCode(model.getProjectBelongingUnit());
|
|
dept.setCode(model.getProjectBelongingUnit());
|
|
|
dept = jdbcClient.getJdbcModel(dept, connection);
|
|
dept = jdbcClient.getJdbcModel(dept, connection);
|
|
|
- if (StringUtil.isEmpty(dept.getDeptId())) {
|
|
|
|
|
- dept.setDeptId((long) 1);
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
List<GldMdmProject> filterList = existGLDList.stream().filter(exist -> model.getId().equals(exist.getId()))
|
|
List<GldMdmProject> filterList = existGLDList.stream().filter(exist -> model.getId().equals(exist.getId()))
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
@@ -151,8 +148,11 @@ public class JobTask {
|
|
|
info.setProjectStatus("inactive");
|
|
info.setProjectStatus("inactive");
|
|
|
}
|
|
}
|
|
|
info.setGldProjectId(model.getGlodonProjectId());
|
|
info.setGldProjectId(model.getGlodonProjectId());
|
|
|
-
|
|
|
|
|
- info.setDeptId(dept.getDeptId());
|
|
|
|
|
|
|
+ if (StringUtil.isEmpty(dept.getDeptId())) {
|
|
|
|
|
+ info.setDeptId((long) 1);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ info.setDeptId(dept.getDeptId());
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (filterProjList.size() > 0) {
|
|
if (filterProjList.size() > 0) {
|
|
|
info.setId(filterProjList.get(0).getId());
|
|
info.setId(filterProjList.get(0).getId());
|