Merge branch 'dev_import' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.12__insert_ic_party_relation.sql

@@ -11,11 +11,12 @@ SELECT
     DEL_FLAG,
     REVISION,
     CREATED_BY,
-    CREATED_TIME,
+    NOW(),
     UPDATED_BY,
-    UPDATED_TIME
+    NOW()
 FROM
-    ic_party_activity;
+    ic_party_activity
+WHERE UNIT_ID IS NOT NULL AND UNIT_ID != '';
 UPDATE ic_activity_unit_relation SET ID = REPLACE (ID, '-', '');
 INSERT INTO ic_activity_service_relation
 SELECT
@@ -30,9 +31,10 @@ SELECT
     DEL_FLAG,
     REVISION,
     CREATED_BY,
-    CREATED_TIME,
+    NOW(),
     UPDATED_BY,
-    UPDATED_TIME
+    NOW()
 FROM
-    ic_party_activity;
+    ic_party_activity
+WHERE SERVICE_MATTER IS NOT NULL AND UNIT_ID != '';
 UPDATE ic_activity_service_relation SET ID = REPLACE (ID, '-', '');