|
@@ -5814,13 +5814,21 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
LocalDate localEndDate = LocalDate.parse(endDate, dateTimeFormatter);
|
|
|
for (Map<String, Object> map : list) {
|
|
|
//取部门名
|
|
|
+// for (Department department : deptName) {
|
|
|
+// if (map.get("deptId").toString().equals(department.getDepartmentId().toString())){
|
|
|
+// if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1){
|
|
|
+// map.put("deptName",getWxDepartment(department));
|
|
|
+// }else {
|
|
|
+// map.put("deptName",getSupDepartment(department));
|
|
|
+// }
|
|
|
+// continue;
|
|
|
+// }
|
|
|
+// }
|
|
|
+
|
|
|
+ //取部门名
|
|
|
for (Department department : deptName) {
|
|
|
if (map.get("deptId").toString().equals(department.getDepartmentId().toString())){
|
|
|
- if (wxCorpInfo!=null && wxCorpInfo.getSaasSyncContact()==1){
|
|
|
- map.put("deptName",getWxDepartment(department));
|
|
|
- }else {
|
|
|
- map.put("deptName",getSupDepartment(department));
|
|
|
- }
|
|
|
+ map.put("deptName",getSupDepartment(department));
|
|
|
continue;
|
|
|
}
|
|
|
}
|