Commit 6ae26235a63dcafd81cf7c548283f6171351cdbe
1 parent
9dcee11880
Exists in
master
and in
8 other branches
add data import :机构、部门、用户(医生)
Showing 1 changed file with 3 additions and 2 deletions
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java
View file @
6ae2623
| ... | ... | @@ -2,6 +2,7 @@ |
| 2 | 2 | |
| 3 | 3 | import com.lyms.platform.biz.service.BasicConfigService; |
| 4 | 4 | import com.lyms.platform.common.enums.YnEnums; |
| 5 | +import com.lyms.platform.common.utils.JsonUtil; | |
| 5 | 6 | import com.lyms.platform.common.utils.LogUtil; |
| 6 | 7 | import com.lyms.platform.data.service.DataImportTaskService; |
| 7 | 8 | import com.lyms.platform.permission.model.*; |
| ... | ... | @@ -168,7 +169,7 @@ |
| 168 | 169 | o.setCreated(o.getModified()); |
| 169 | 170 | organizationService.addOrganization(o); |
| 170 | 171 | } |
| 171 | - for (Departments d:organization.getDepartmentsMap().values()) { | |
| 172 | + for (Departments d:o.getDepartmentsMap().values()) { | |
| 172 | 173 | d.setOrgId(o.getId()); |
| 173 | 174 | departmentsQuery.setForeignId(d.getForeignId()); |
| 174 | 175 | List<Departments> departmentsList = departmentsService.queryDepartments(departmentsQuery); |
| ... | ... | @@ -181,7 +182,7 @@ |
| 181 | 182 | d.setCreated(d.getModified()); |
| 182 | 183 | departmentsService.addDepartments(d); |
| 183 | 184 | } |
| 184 | - for (Users u:departments.getUsersMap().values()) { | |
| 185 | + for (Users u:d.getUsersMap().values()) { | |
| 185 | 186 | u.setOrgId(o.getId()); |
| 186 | 187 | u.setDeptId(d.getId()); |
| 187 | 188 | u.setKsId(d.getId()); |