From 6ae26235a63dcafd81cf7c548283f6171351cdbe Mon Sep 17 00:00:00 2001 From: baohanddd Date: Sat, 30 Apr 2016 20:04:54 +0800 Subject: [PATCH] =?UTF-8?q?add=20data=20import=20:=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81=E7=94=A8=E6=88=B7(?= =?UTF-8?q?=E5=8C=BB=E7=94=9F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/data/service/impl/DataImportTaskServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java index ad5a690..6c50f93 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.lyms.platform.data.service.impl; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.LogUtil; import com.lyms.platform.data.service.DataImportTaskService; import com.lyms.platform.permission.model.*; @@ -168,7 +169,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { o.setCreated(o.getModified()); organizationService.addOrganization(o); } - for (Departments d:organization.getDepartmentsMap().values()) { + for (Departments d:o.getDepartmentsMap().values()) { d.setOrgId(o.getId()); departmentsQuery.setForeignId(d.getForeignId()); List departmentsList = departmentsService.queryDepartments(departmentsQuery); @@ -181,7 +182,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { d.setCreated(d.getModified()); departmentsService.addDepartments(d); } - for (Users u:departments.getUsersMap().values()) { + for (Users u:d.getUsersMap().values()) { u.setOrgId(o.getId()); u.setDeptId(d.getId()); u.setKsId(d.getId()); -- 1.8.3.1