فهرست منبع

部门名修改

cs 2 سال پیش
والد
کامیت
a8b98a0483

+ 13 - 5
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -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;
                 }
             }