Commit c3ef9243 authored by 刘林's avatar 刘林

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

parents d92c1edb 08641c03
...@@ -113,8 +113,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto, ...@@ -113,8 +113,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
WorkflowResultDto workflowResultDto = new WorkflowResultDto(); WorkflowResultDto workflowResultDto = new WorkflowResultDto();
List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>(); List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
jgEnableDisable.setEquList("null".equals(record) ? "null" : map.get("equListDesc").toString()); jgEnableDisable.setEquList("null".equals(record) ? "null" : String.valueOf(map.get("equListDesc")));
jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : map.get("supervisoryCode").toString()); jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : String.valueOf(map.get("supervisoryCode")));
jgEnableDisable.setEquCategory(ObjectUtils.isEmpty(map.get("equCategoryDesc")) ? null : map.get("equCategoryDesc").toString()); jgEnableDisable.setEquCategory(ObjectUtils.isEmpty(map.get("equCategoryDesc")) ? null : map.get("equCategoryDesc").toString());
jgEnableDisable.setProductName(ObjectUtils.isEmpty(map.get("productName")) ? null : map.get("productName").toString()); jgEnableDisable.setProductName(ObjectUtils.isEmpty(map.get("productName")) ? null : map.get("productName").toString());
......
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