整理同步问题

src/main/java/com/system/kingdee/KingDeeCommonPushApi.java

@@ -135,21 +135,23 @@ public class KingDeeCommonPushApi {
         String retrievalField = field.get("retrievalField");
         String mapBill = field.get("mapBill");
         
-        String defaultValue = String.valueOf(field.get("defaultValue"));
+        String defaultValue = field.get("defaultValue");
         
-        if(!Constants.NULL.equals(defaultValue) && !Constants.EMPTY.equalsIgnoreCase(defaultValue))
+        if(StringUtil.isNotBlank(thirdPartyField))
         {
-            if (StringUtil.isNotBlank(retrievalField)) {
-                temp.put(kingDeeField, new HashMap<String, Object>(1) {{
-                    put(retrievalField, defaultValue);
-                }});
-            } else {
-                temp.put(kingDeeField, defaultValue);
-            }
+        	SetDefaultValue(temp, defaultValue, retrievalField, kingDeeField);
+	        return;
         }
-        
+
         Object curValue = ExcuteScript(thirdPartyField, map);
         
+
+        if(curValue == null)
+        {
+        	SetDefaultValue(temp, defaultValue, retrievalField, kingDeeField);
+	        return;
+        }
+        
         if(StringUtil.isNotBlank(mapBill))
         {
         	Map<String, Object> fieldValues;
@@ -174,6 +176,20 @@ public class KingDeeCommonPushApi {
         SetKingdeeValue(temp, kingDeeField, retrievalField, curValue);
     }
     
+    private void SetDefaultValue(Map<String, Object> temp, String defaultValue, String retrievalField, String kingDeeField)
+    {
+        if(!StringUtil.isNotBlank(defaultValue))
+        {
+            if (StringUtil.isNotBlank(retrievalField)) {
+                temp.put(kingDeeField, new HashMap<String, Object>(1) {{
+                    put(retrievalField, defaultValue);
+                }});
+            } else {
+                temp.put(kingDeeField, defaultValue);
+            }
+        }
+    }
+    
     private void SetKingdeeValue(Map<String, Object> temp, String kingDeeField, String retrievalField, Object curValue)
     {
         if (!Constants.NULL.equals(curValue)) {