Commit 57ef45bb authored by 刘林's avatar 刘林

fix(jg):企业资质维护不填写资质信息报未知错误

parent f0f2fecd
...@@ -713,14 +713,21 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -713,14 +713,21 @@ public class TzBaseEnterpriseInfoServiceImpl
private void saveLicenceData(Map<String, Object> map) { private void saveLicenceData(Map<String, Object> map) {
List<BaseUnitLicence> licences = Lists.newArrayList(); List<BaseUnitLicence> licences = Lists.newArrayList();
List<DataDictionary> dictionaries = regUnitInfoService.initAllDataDictionaryList(); List<DataDictionary> dictionaries = regUnitInfoService.initAllDataDictionaryList();
JSON.parseArray(JSON.toJSONString(map.get("unitLicences"))).forEach(obj -> { Object unitLicences = map.get("unitLicences");
BaseUnitLicence baseUnitLicence = JSON.toJavaObject((JSONObject)obj, BaseUnitLicence.class); if (unitLicences instanceof Collection && !((Collection<?>) unitLicences).isEmpty()) {
baseUnitLicence.setUnitCode(ObjectUtils.isEmpty(map.get("useCode")) ? null : (String)map.get("useCode")); JSON.parseArray(JSON.toJSONString(unitLicences)).forEach(obj -> {
baseUnitLicence.setUnitName(ObjectUtils.isEmpty(map.get("useUnit")) ? null : (String)map.get("useUnit")); BaseUnitLicence baseUnitLicence = JSON.toJavaObject((JSONObject) obj, BaseUnitLicence.class);
// 处理许可字典值对应名称 if (ObjectUtils.isEmpty(baseUnitLicence.getLicAddress())) {
handleDictName(baseUnitLicence, dictionaries); throw new IllegalArgumentException("许可地址不能为空!");
licences.add(baseUnitLicence); }
}); baseUnitLicence.setUnitCode(ObjectUtils.isEmpty(map.get("useCode")) ? null : (String) map.get("useCode"));
baseUnitLicence.setUnitName(ObjectUtils.isEmpty(map.get("useUnit")) ? null : (String) map.get("useUnit"));
// 处理许可字典值对应名称
handleDictName(baseUnitLicence, dictionaries);
// 添加到结果集合
licences.add(baseUnitLicence);
});
}
if (!ValidationUtil.isEmpty(licences)){ if (!ValidationUtil.isEmpty(licences)){
baseUnitLicenceService.saveOrUpdateBatch(licences); baseUnitLicenceService.saveOrUpdateBatch(licences);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment