From 6e943e240d421b237c0ee7fc5d203a8734f0b104 Mon Sep 17 00:00:00 2001 From: baohanddd Date: Thu, 5 May 2016 17:09:21 +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 --- .../com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java | 2 ++ .../java/com/lyms/platform/operate/web/controller/RegionController.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 3e080f3..ea010f6 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 @@ -274,6 +274,8 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { u.setOrgId(o.getId()); u.setDeptId(d.getId()); u.setKsId(d.getId()); + u.setType(1); + u.setOtherAccount(1); u.setLogincenterId(LoginUtil.aouHospitalUser(u.getAccount(), u.getPwd(), typeId, token)); usersQuery.setForeignId(u.getForeignId()); List usersList = usersService.queryUsers(usersQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java index d4fd6f1..7a50c64 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java @@ -88,7 +88,7 @@ public class RegionController extends BaseController{ region.put("id",config.getId()); region.put("regionName",config.getName()); region.put("parentId", config.getParentId()); - region.put("code", config.getCode()); + region.put("code", config.getCode() ); list.add(region); } } -- 1.8.3.1