Merge branch 'master' of http://39.106.8.246:3003/persagy/dmp

dmp-rwd-datautils/src/test/java/com/persagy/dmp/rwd/dic/DataTypeMapping.java

@@ -95,6 +95,8 @@ public class DataTypeMapping {
 		list.add(init("Timeis", "DATETIME", "PULSE", "Y", "N"));
 		list.add(init("DTimei", "DATETIME", "PULSE", "N", "N"));
 		list.add(init("DTimeis", "DATETIME", "PULSE", "Y", "N"));
+		list.add(init("Pic", "ATTACHMENT", "STATIC", "N", "N"));
+		list.add(init("Pics", "ATTACHMENT", "STATIC", "Y", "N"));
 	}
 
 	private static FuncidDefModel init(String origType, String dataType, String category, String isMulti, String isRegion) {

dmp-rwd-datautils/src/test/java/com/persagy/dmp/rwd/dic/FuncidUtils.java

@@ -195,7 +195,7 @@ public class FuncidUtils {
                 item.put("code", JacksonMapper.getString(obj, "code"));
                 item.put("name", JacksonMapper.getString(obj, "name"));
                 String parentCode = JacksonMapper.getString(obj, "parentCode");
-                if (parentCode != null) {
+                if (parentCode != null && !("-9999".equals(parentCode))) {
                     item.put("parentCode", parentCode);
                 }
             }