Merge branch 'develop' of http://192.168.0.144/dcuc-tjdsj/auth-service into mazq-1227-userOrgAdd

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/business/impl/SubSyncBusinessImpl.java

@@ -1405,8 +1405,16 @@ public class SubSyncBusinessImpl implements ISubSyncBusiness {
         AuthOrgInfo authOrgInfo = JSON.parseObject(jsonData, AuthOrgInfo.class);
         JSONObject originalData = JSON.parseObject(jsonData);
         String orgCode = originalData.getString("orgCode");
+        if(StringUtils.isBlank(orgCode)) {
+            orgCode = null;
+        }
         authOrgInfo.setCode(orgCode);
-        authOrgInfo.setUpGovCode(originalData.getString("upOrgCode"));
+        String upOrgCode = originalData.getString("upOrgCode");
+        //防止为""的情况
+        if(StringUtils.isBlank(upOrgCode)) {
+            upOrgCode = null;
+        }
+        authOrgInfo.setUpGovCode(upOrgCode);
         authOrgInfo.setDeleted(BooleanEnum.FALSE.value);
         return authOrgInfo;
     }