Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/nfykdxnfyy/OrgUserDataWebServiceManagerImpl.java =================================================================== diff -u -r32649 -r40919 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/nfykdxnfyy/OrgUserDataWebServiceManagerImpl.java (.../OrgUserDataWebServiceManagerImpl.java) (revision 32649) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/nfykdxnfyy/OrgUserDataWebServiceManagerImpl.java (.../OrgUserDataWebServiceManagerImpl.java) (revision 40919) @@ -150,8 +150,8 @@ for (Object object : deptInfoArr) { JSONObject deptInfo = (JSONObject) object; OrgUnitVo vo = new OrgUnitVo(); - vo.setDeptCode(deptInfo.optString("CTD_Code")); - String departName = deptInfo.optString("CTD_Desc"); + vo.setDeptCode(deptInfo.opt("CTD_Code") instanceof String ? (String)deptInfo.opt("CTD_Code") : null); + String departName = deptInfo.opt("CTD_Desc") instanceof String ? (String)deptInfo.opt("CTD_Desc") : null; if(StringUtils.isNotBlank(departName)){ String[] departNameArr = departName.split("-"); if(departNameArr.length > 1){ @@ -161,7 +161,7 @@ } } vo.setDeptName(departName); - vo.setParentCoding(deptInfo.optString("CTD_ParentDeptCode")); + vo.setParentCoding(deptInfo.opt("CTD_ParentDeptCode") instanceof String ? (String)deptInfo.opt("CTD_ParentDeptCode") : null); vos[i++] = vo; } dataSynchronizationManager.processSyncOrgUnitData(vos); @@ -221,10 +221,10 @@ UserVo vo = new UserVo(); JSONObject useInfo = useInfoArr.getJSONObject(i); //NFYY-18字段的值为HIS账号,HIS系统有工号和账号,用户统一用账号登录,追溯系统需要取HIS账号作为工号 - vo.setCoding(useInfo.optString("CTCP_Remarks")); - vo.setName(useInfo.optString("CTCP_Desc")); - vo.setDeptCode(useInfo.optString("CTCP_DeptCode")); - vo.setPasswd(useInfo.optString("CTCP_PassWord")); + vo.setCoding(useInfo.opt("CTCP_Remarks") instanceof String ? (String)useInfo.opt("CTCP_Remarks") : null); + vo.setName(useInfo.opt("CTCP_Desc") instanceof String ? (String)useInfo.opt("CTCP_Desc") : null); + vo.setDeptCode(useInfo.opt("CTCP_DeptCode") instanceof String ? (String)useInfo.opt("CTCP_DeptCode") : null); + vo.setPasswd(useInfo.opt("CTCP_PassWord") instanceof String ? (String)useInfo.opt("CTCP_PassWord") : null); vos[i] = vo; } dataSynchronizationManager.processSyncUserData(vos);