diff --git a/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java b/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
index 6b50aa1..aab10d6 100644
--- a/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
+++ b/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
@@ -240,9 +240,11 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
                 }
 
                 // 获取人口详情
-                PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
-                if(null != populationInfoDTO) {
-                    populationDTO.setPopulationInfoDTO(populationInfoDTO);
+                if(StringUtils.isNotEmpty(populationDTO.getPopulationInfoId())) {
+                    PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
+                    if (null != populationInfoDTO) {
+                        populationDTO.setPopulationInfoDTO(populationInfoDTO);
+                    }
                 }
             }
         }
@@ -257,15 +259,17 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
 
         // 获取人口详情
         for (PopulationDTO populationDTO : overList) {
-            PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
-            PopulationInfoHouseDTO populationInfoHouseDTO = new PopulationInfoHouseDTO();
-            BeanUtils.copyProperties(populationInfoDTO, populationInfoHouseDTO);
+            if(StringUtils.isNotEmpty(populationDTO.getPopulationInfoId())) {
+                PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
+                PopulationInfoHouseDTO populationInfoHouseDTO = new PopulationInfoHouseDTO();
+                BeanUtils.copyProperties(populationInfoDTO, populationInfoHouseDTO);
 
-            // 获取人员
-            PopulationInfoBaseDTO base = populationInfoService.getBase(populationDTO.getPopulationInfoId());
-            populationInfoHouseDTO.setPopulationInfoBaseDTO(base);
+                // 获取人员
+                PopulationInfoBaseDTO base = populationInfoService.getBase(populationDTO.getPopulationInfoId());
+                populationInfoHouseDTO.setPopulationInfoBaseDTO(base);
 
-            populationDTO.setPopulationInfoHouseDTO(populationInfoHouseDTO);
+                populationDTO.setPopulationInfoHouseDTO(populationInfoHouseDTO);
+            }
 
             // 获取房屋详情
             HouseDTO houseDTO = houseService.get(populationDTO.getHouseId());
diff --git a/src/main/resources/templates/population/list.html b/src/main/resources/templates/population/list.html
index 0631733..7c344b2 100644
--- a/src/main/resources/templates/population/list.html
+++ b/src/main/resources/templates/population/list.html
@@ -31,6 +31,9 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
                                 <i class="fa fa-lg fa-plus"></i> 新增
                             </button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
                             <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
                                 <i class="fa fa-lg fa-trash"></i> 删除
                             </button>
diff --git a/src/main/resources/templates/population/save.html b/src/main/resources/templates/population/save.html
index e766fc1..2d4f04c 100644
--- a/src/main/resources/templates/population/save.html
+++ b/src/main/resources/templates/population/save.html
@@ -33,13 +33,13 @@
                     <div class="layui-input-block">
                         <input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="36">
                         <input type="hidden" id="houseId" name="houseId" class="layui-input" value="" maxlength="36">
-                        <input type="text" readonly id="name" name="name" class="layui-input" value="" placeholder="请输入姓名"  maxlength="255">
+                        <input type="text" id="name" name="name" class="layui-input" value="" placeholder="请输入姓名"  maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">证件号码</label>
                     <div class="layui-input-block">
-                        <input type="text" readonly id="cardNum" name="cardNum" class="layui-input" value="" placeholder="请输入证件号码"  maxlength="20">
+                        <input type="text" id="cardNum" name="cardNum" class="layui-input" value="" placeholder="请输入证件号码"  maxlength="20">
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/src/main/resources/templates/population/update.html b/src/main/resources/templates/population/update.html
index 45d8849..f857efe 100644
--- a/src/main/resources/templates/population/update.html
+++ b/src/main/resources/templates/population/update.html
@@ -33,13 +33,13 @@
                     <div class="layui-input-block">
                         <input type="hidden" id="populationInfoId" name="populationInfoId" class="layui-input" value="" maxlength="36">
                         <input type="hidden" id="houseId" name="houseId" class="layui-input" value="" maxlength="36">
-                        <input type="text" readonly id="name" name="name" class="layui-input" value="" placeholder="请输入姓名"  maxlength="255">
+                        <input type="text" id="name" name="name" class="layui-input" value="" placeholder="请输入姓名"  maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">证件号码</label>
                     <div class="layui-input-block">
-                        <input type="text" readonly id="cardNum" name="cardNum" class="layui-input" value="" placeholder="请输入证件号码"  maxlength="20">
+                        <input type="text" id="cardNum" name="cardNum" class="layui-input" value="" placeholder="请输入证件号码"  maxlength="20">
                     </div>
                 </div>
                 <div class="layui-form-item">