1114需要变更

easydo-chengfa/src/main/java/easydo/technology/quartz/task/JobTask.java

@@ -121,6 +121,12 @@ public class JobTask {
                 if (StringUtil.isEmpty(model.getProjectBelongingUnit())) {
                     continue;
                 }
+                SysDept dept = new SysDept();
+                dept.setCode(model.getProjectBelongingUnit());
+                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()))
                         .collect(Collectors.toList());
@@ -129,8 +135,13 @@ public class JobTask {
                 } else {
                     jdbcClient.jdbcInsert(model, connection);
                 }
+
+                SysDept finalDept = dept;
                 List<ProjectInfo> filterProjList = existProjList.stream()
-                        .filter(exist -> model.getProjectCode().equals(exist.getProjectNo())).collect(Collectors.toList());
+                        .filter(exist ->
+                                model.getProjectCode().equals(exist.getProjectNo())
+                                        && finalDept.getDeptId().equals(exist.getDeptId())
+                        ).collect(Collectors.toList());
                 ProjectInfo info = new ProjectInfo();
                 info.setProjectName(model.getProjectName());
                 info.setProjectNo(model.getProjectCode());
@@ -141,14 +152,7 @@ public class JobTask {
                 }
                 info.setGldProjectId(model.getGlodonProjectId());
 
-                SysDept dept = new SysDept();
-                dept.setCode(model.getProjectBelongingUnit());
-                dept = jdbcClient.getJdbcModel(dept, connection);
-                if (StringUtil.isEmpty(dept.getDeptId())) {
-                    info.setDeptId((long) 1);
-                } else {
-                    info.setDeptId(dept.getDeptId());
-                }
+                info.setDeptId(dept.getDeptId());
 
                 if (filterProjList.size() > 0) {
                     info.setId(filterProjList.get(0).getId());