Commit 8dba1c64 authored by chenzhao's avatar chenzhao

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 11b16bcd 963c3a2a
......@@ -620,6 +620,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
Optional.ofNullable(map.get("useRegistrationFormFile"))
.map(JSONObject::toJSONString)
.ifPresent(jgUseRegistration::setUseRegistrationFormFile);
map.put("userName", reginParams.getUserModel().getRealName());
Map<String, Object> useRegistrationFormUrlMap = commonService.getRegistrationFormUrl("set", map);
Optional.ofNullable(useRegistrationFormUrlMap)
.ifPresent(item -> jgUseRegistration.setUseRegistrationFormUrl(String.valueOf(item.get("useRegistrationFormUrl"))));
......@@ -908,6 +909,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
Optional.ofNullable(map.get("useRegistrationFormFile"))
.map(JSONObject::toJSONString)
.ifPresent(useRegistration::setUseRegistrationFormFile);
map.put("userName", reginParams.getUserModel().getRealName());
Map<String, Object> useRegistrationFormUrlMap = commonService.getRegistrationFormUrl("unit", map);
Optional.ofNullable(useRegistrationFormUrlMap)
.ifPresent(item -> useRegistration.setUseRegistrationFormUrl(String.valueOf(item.get("useRegistrationFormUrl"))));
......
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