From bba1664149af0a360be5235d14130aecc0377cae Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Sat, 30 Apr 2016 19:46:05 +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

---
 .../service/impl/DataImportTaskServiceImpl.java    | 25 +++++++++++-----------
 .../src/main/resources/earlyOrm/Plat.xml           |  2 +-
 2 files changed, 13 insertions(+), 14 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 68f7fc0..3b99837 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
@@ -84,7 +84,7 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                 for (Map map:list) {
                     try {
                         // organization
-                        if (StringUtils.isBlank(organization.getForeignId()) || !organization.getForeignId().equals(map.get("H_ID"))) {
+                        if (StringUtils.isBlank(organization.getForeignId()) || !map.get("H_ID").equals(organization.getForeignId())) {
                             if (!organizationMap.containsKey(map.get("H_ID").toString())) {
                                 organization = new Organization();
                                 organization.setForeignId(map.get("H_ID").toString());
@@ -105,12 +105,10 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                         }
 
                         // Departments
-                        if (StringUtils.isBlank(departments.getForeignId()) || !departments.getForeignId().equals(map.get("D_ID"))) {
-                            if (!organization.getDepartmentsMap().containsKey(map.get("D_ID").toString())) {
-                                departments = new Departments();
-                                departments.setForeignId(map.get("D_ID").toString());
-                                organization.getDepartmentsMap().put(departments.getForeignId(), departments);
-                            }
+                        if (StringUtils.isBlank(departments.getForeignId()) || !map.get("D_ID").toString().equals(departments.getForeignId())) {
+                            departments = new Departments();
+                            departments.setForeignId(map.get("D_ID").toString());
+                            organization.getDepartmentsMap().put(departments.getForeignId(), departments);
                             departments.setPublishName("system");
                             departments.setType(2);
                             departments.setPublishId(0);
@@ -122,12 +120,10 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                         }
 
                         // users
-                        if (StringUtils.isBlank(users.getForeignId()) || !users.getForeignId().equals(map.get("U_ID"))) {
-                            if (!departments.getUsersMap().containsKey(map.get("U_ID").toString())) {
-                                users = new Users();
-                                users.setForeignId(map.get("U_ID").toString());
-                                departments.getUsersMap().put(users.getForeignId(), users);
-                            }
+                        if (StringUtils.isBlank(users.getForeignId()) || !map.get("U_ID").toString().equals(users.getForeignId())) {
+                            users = new Users();
+                            users.setForeignId(map.get("U_ID").toString());
+                            departments.getUsersMap().put(users.getForeignId(), users);
                             users.setPublishId(0);
                             users.setPublishName("system");
                             users.setOrgId(organization.getId());
@@ -161,6 +157,9 @@ public class DataImportTaskServiceImpl implements DataImportTaskService {
                 UsersQuery usersQuery = new UsersQuery();
                 for (Organization o:organizationMap.values()) {
                     try {
+                        if (true) {
+                            continue;
+                        }
                         organizationQuery.setForeignId(organization.getForeignId());
                         List<Organization> organizationList = organizationService.queryOrganization(organizationQuery);
                         if (organizationList != null && organizationList.size() > 0) {
diff --git a/platform-mommyData/src/main/resources/earlyOrm/Plat.xml b/platform-mommyData/src/main/resources/earlyOrm/Plat.xml
index 77e43e7..1523c03 100644
--- a/platform-mommyData/src/main/resources/earlyOrm/Plat.xml
+++ b/platform-mommyData/src/main/resources/earlyOrm/Plat.xml
@@ -218,7 +218,7 @@
         <if test="startTime != null">
             and (u.u_opertime >= #{startTime} or e.e_opertime >= #{startTime} or d.d_opertime >= #{startTime}  )
         </if>
-        order by u.u_id
+        order by h.h_id,d.d_id,u.u_id
     </select>
 
 
-- 
1.8.3.1