diff --git a/src/main/java/com/cm/population/controller/api/populationinfo/PopulationInfoController.java b/src/main/java/com/cm/population/controller/api/populationinfo/PopulationInfoController.java index 159a35f..5f14bbe 100644 --- a/src/main/java/com/cm/population/controller/api/populationinfo/PopulationInfoController.java +++ b/src/main/java/com/cm/population/controller/api/populationinfo/PopulationInfoController.java @@ -111,7 +111,7 @@ public class PopulationInfoController extends AbstractController { final int[] starNumber = {1}; final int[] notData = {0}; final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - final List idcardTypeList = iDataDictionaryService.listDictionaryByParentId("360d6062-754d-4d43-95ba-cb9938102050");//证件类型下拉选择 + final List idcardTypeList = iDataDictionaryService.listDictionaryByParentId("76c5044f-805a-4313-b1e8-79e966b97c0d");//证件类型下拉选择 final List sexList = iDataDictionaryService.listDictionaryByParentId("4ef46940-76ab-4758-b5f0-0cbc93ffc660");//性别下拉选择 final List nationList = iDataDictionaryService.listDictionaryByParentId("a981579c-572b-4fd1-8e76-5d17df97f6a4");//民族下拉选择 final List educationList = iDataDictionaryService.listDictionaryByParentId("d6b9f026-6ea9-456a-b48b-0c18d502523b");//文化程度下拉选择择 diff --git a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java index e1f4f4f..1408dc1 100644 --- a/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java +++ b/src/main/java/com/cm/population/pojo/dtos/populationinfo/PopulationInfoBaseDTO.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils; import java.time.LocalDate; import java.time.Period; +import java.util.ArrayList; import java.util.List; @ApiModel @@ -70,7 +71,7 @@ public class PopulationInfoBaseDTO { private String creator; public List getLabelList() { - return labelList; + return labelList == null ? new ArrayList<>() : labelList; } public void setLabelList(List labelList) { diff --git a/src/main/resources/templates/dispute/save.html b/src/main/resources/templates/dispute/save.html index ed9e3ad..3529aff 100644 --- a/src/main/resources/templates/dispute/save.html +++ b/src/main/resources/templates/dispute/save.html @@ -1019,7 +1019,7 @@ // 初始化证件类型下拉选择 function initPartyIdcardTypeSelect(selectValue) { - top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { + top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) { laytpl(document.getElementById('partyIdcardTypeSelectTemplate').innerHTML).render(data, function(html) { document.getElementById('partyIdcardTypeSelectTemplateBox').innerHTML = html; }); diff --git a/src/main/resources/templates/dispute/update.html b/src/main/resources/templates/dispute/update.html index 3cbc5b4..c22f7f4 100644 --- a/src/main/resources/templates/dispute/update.html +++ b/src/main/resources/templates/dispute/update.html @@ -986,7 +986,7 @@ // 初始化证件类型下拉选择 function initPartyIdcardTypeSelect(selectValue) { - top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { + top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) { laytpl(document.getElementById('partyIdcardTypeSelectTemplate').innerHTML).render(data, function(html) { document.getElementById('partyIdcardTypeSelectTemplateBox').innerHTML = html; }); diff --git a/src/main/resources/templates/house/list-popu.html b/src/main/resources/templates/house/list-popu.html index b7c1640..862509b 100644 --- a/src/main/resources/templates/house/list-popu.html +++ b/src/main/resources/templates/house/list-popu.html @@ -82,7 +82,7 @@ // 初始化证件类型下拉选择 function initIdcardTypeSelect() { - top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { + top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) { laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) { document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html; }); diff --git a/src/main/resources/templates/populationinfo/list-creator.html b/src/main/resources/templates/populationinfo/list-creator.html index 5c15857..30d77fe 100644 --- a/src/main/resources/templates/populationinfo/list-creator.html +++ b/src/main/resources/templates/populationinfo/list-creator.html @@ -112,7 +112,7 @@ // 初始化证件类型下拉选择 function initIdcardTypeSelect() { - top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { + top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) { laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) { document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html; }); diff --git a/src/main/resources/templates/populationinfo/list.html b/src/main/resources/templates/populationinfo/list.html index a839106..e9da1f2 100644 --- a/src/main/resources/templates/populationinfo/list.html +++ b/src/main/resources/templates/populationinfo/list.html @@ -112,7 +112,7 @@ // 初始化证件类型下拉选择 function initIdcardTypeSelect() { - top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { + top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) { laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) { document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html; }); diff --git a/src/main/resources/templates/populationinfo/query.html b/src/main/resources/templates/populationinfo/query.html index 183f2fc..caa65ec 100644 --- a/src/main/resources/templates/populationinfo/query.html +++ b/src/main/resources/templates/populationinfo/query.html @@ -82,7 +82,7 @@ // 初始化证件类型下拉选择 function initIdcardTypeSelect() { - top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/360d6062-754d-4d43-95ba-cb9938102050', []), {}, null, function(code, data, args) { + top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) { laytpl(document.getElementById('idcardTypeSelectTemplate').innerHTML).render(data, function(html) { document.getElementById('idcardTypeSelectTemplateBox').innerHTML = html; });