From f2e4f0cbf2b593f9f860428de67e6fef55a30fb8 Mon Sep 17 00:00:00 2001
From: "java_cuibaocheng@163.com" <java_cuibaocheng@163.com>
Date: Wed, 15 Nov 2023 18:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=8C=BA=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BF=9D=E5=AD=98Bug=20=E4=BA=BA=E5=8F=A3=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF-=E4=BF=AE=E6=94=B9=E4=BA=BA?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=A1=E6=81=AF=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=AF=86=E5=88=AB=E6=80=A7=E5=88=AB/=E7=94=9F?=
 =?UTF-8?q?=E6=97=A5Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../populationinfo/population-info-mapper.xml    |  2 ++
 .../resources/templates/populationinfo/save.html | 16 +++++++++-------
 .../templates/populationinfo/update.html         | 16 +++++++++-------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
index 44b87f6..ca7b696 100644
--- a/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
+++ b/src/main/resources/mybatis/mapper/populationinfo/population-info-mapper.xml
@@ -275,6 +275,7 @@
             mother_phone,
             relationship,
             domicile_address,
+            domicile_address_type,
             domicile_area_code,
             domicile_area_name,
             origin_address,
@@ -355,6 +356,7 @@
             #{motherPhone},
             #{relationship},
             #{domicileAddress},
+            #{domicileAddressType},
             #{domicileAreaCode},
             #{domicileAreaName},
             #{originAddress},
diff --git a/src/main/resources/templates/populationinfo/save.html b/src/main/resources/templates/populationinfo/save.html
index 8b1df46..f14a9fd 100644
--- a/src/main/resources/templates/populationinfo/save.html
+++ b/src/main/resources/templates/populationinfo/save.html
@@ -1149,14 +1149,16 @@
                 laytpl(document.getElementById('labelSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('labelSelectTemplateBox').innerHTML = html;
                 });
-                form.render('checkbox', 'labelSelectTemplateBox')
+                form.render('checkbox', 'labelSelectTemplateBox');
 
-                var checkboxValue = selectValues.split(',');
-                var checkboxObj = {};
-                for(var j = 0, checkbox = checkboxValue[j]; checkbox = checkboxValue[j++];) {
-                    checkboxObj['label['+ checkbox +']'] = true;
+                if(selectValues) {
+                    var checkboxValue = selectValues.split(',');
+                    var checkboxObj = {};
+                    for(var j = 0, checkbox = checkboxValue[j]; checkbox = checkboxValue[j++];) {
+                        checkboxObj['label['+ checkbox +']'] = true;
+                    }
+                    form.val('dataForm', checkboxObj);
                 }
-                form.val('dataForm', checkboxObj);
             }, function(code, data) {
                 top.dialog.msg(data.msg);
             });
@@ -1469,7 +1471,7 @@
         // 身份证号改变时发生
         $('#idcard').on("input propertychange", function () {
             var idCardNo = $(this).val();
-            if (idCardNo.length > 15 && idCardNo.length < 18) {
+            if (idCardNo.length == 15 || idCardNo.length == 18) {
                 if (idCardNoUtil.checkIdCardNo(idCardNo)) {
                     //获取身份证信息
                     var idCardInfo = idCardNoUtil.getIdCardInfo(idCardNo);
diff --git a/src/main/resources/templates/populationinfo/update.html b/src/main/resources/templates/populationinfo/update.html
index af015d4..86a31d5 100644
--- a/src/main/resources/templates/populationinfo/update.html
+++ b/src/main/resources/templates/populationinfo/update.html
@@ -1061,14 +1061,16 @@
                 laytpl(document.getElementById('labelSelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('labelSelectTemplateBox').innerHTML = html;
                 });
-                form.render('checkbox', 'labelSelectTemplateBox')
+                form.render('checkbox', 'labelSelectTemplateBox');
 
-                var checkboxValue = selectValues.split(',');
-                var checkboxObj = {};
-                for(var j = 0, checkbox = checkboxValue[j]; checkbox = checkboxValue[j++];) {
-                    checkboxObj['label['+ checkbox +']'] = true;
+                if(selectValues) {
+                    var checkboxValue = selectValues.split(',');
+                    var checkboxObj = {};
+                    for (var j = 0, checkbox = checkboxValue[j]; checkbox = checkboxValue[j++];) {
+                        checkboxObj['label[' + checkbox + ']'] = true;
+                    }
+                    form.val('dataForm', checkboxObj);
                 }
-                form.val('dataForm', checkboxObj);
             }, function(code, data) {
                 top.dialog.msg(data.msg);
             });
@@ -1381,7 +1383,7 @@
         // 身份证号改变时发生
         $('#idcard').on("input propertychange", function () {
             var idCardNo = $(this).val();
-            if (idCardNo.length > 15 && idCardNo.length < 18) {
+            if (idCardNo.length == 15 || idCardNo.length == 18) {
                 if (idCardNoUtil.checkIdCardNo(idCardNo)) {
                     //获取身份证信息
                     var idCardInfo = idCardNoUtil.getIdCardInfo(idCardNo);