diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml
index e29b9439..30cc9c22 100644
--- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml
+++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/mapper/xml/EmployeesApplyMapper.xml
@@ -3,44 +3,7 @@
 <mapper namespace="com.nu.modules.employeesapply.mapper.EmployeesApplyMapper">
 
     <select id="findPage" resultType="com.nu.modules.employeesapply.entity.EmployeesApply">
-        SELECT sup.* FROM (
-            SELECT
-                b.id AS id,
-                b.employee_id,
-                b.name,
-                b.sex,
-                b.date_of_birth,
-                b.tel,
-                b.national,
-                b.id_card,
-                b.married_or_not,
-                CONCAT(b.height, '') as height,
-                CONCAT(b.weight, '') as weight,
-                b.health_status,
-                b.political_appearance,
-                b.house_address,
-                b.emergency_contact,
-                b.emergency_tel,
-                b.emergency_relationship,
-                b.hukou_nature,
-                b.current_address,
-                b.id_card_positive,
-                b.id_card_negative,
-                b.health_certificate_positive,
-                b.bank_positive,
-                b.bank_negative,
-                b.qualification,
-                b.no_crime_certificate,
-                b.create_time,
-                b.status,
-                b.modify_status,
-                b.apply_type,
-                b.audit_content,
-                b.iz_history,
-                b.open_id,
-                b.head_path
-            FROM nu_biz_employees_apply b
-        ) sup
+        SELECT * FROM nu_biz_employees_apply
         ${ew.customSqlSegment}
     </select>
 
@@ -70,17 +33,16 @@
                 a.id_card_negative,
                 a.health_certificate_positive,
                 a.bank_positive,
-                a.bank_negative,
                 a.qualification,
                 a.no_crime_certificate,
+                a.head_path,
                 a.create_time,
                 b.status,
                 b.modify_status,
                 b.apply_type,
                 b.audit_content,
                 b.iz_history,
-                b.open_id,
-                a.head_path
+                b.open_id
             FROM nu_biz_employees_info a
             LEFT JOIN nu_biz_employees_apply b ON a.id = b.employee_id AND b.iz_history = 'N'
             WHERE a.del_flag = '0' AND a.iz_freeze = 'N'
@@ -109,7 +71,6 @@
                 b.id_card_negative,
                 b.health_certificate_positive,
                 b.bank_positive,
-                b.bank_negative,
                 b.qualification,
                 b.no_crime_certificate,
                 b.create_time,
@@ -157,7 +118,6 @@
             b.id_card_negative,
             b.health_certificate_positive,
             b.bank_positive,
-            b.bank_negative,
             b.qualification,
             b.no_crime_certificate,
             b.create_time,
@@ -197,7 +157,6 @@
             b.id_card_negative,
             b.health_certificate_positive,
             b.bank_positive,
-            b.bank_negative,
             b.qualification,
             b.no_crime_certificate,
             b.create_time,
@@ -244,7 +203,6 @@
             b.id_card_negative,
             b.health_certificate_positive,
             b.bank_positive,
-            b.bank_negative,
             b.qualification,
             b.no_crime_certificate,
             b.create_time,
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
index 31974367..98b4ed29 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
@@ -431,7 +431,9 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
     @Override
     public List<CameraInfoEntity> getCameraInfoList(CameraInfoEntity cameraInfoEntity) {
         CameraInfo cameraInfo = new CameraInfo();
-        BeanUtils.copyProperties(cameraInfoEntity, cameraInfo);
+        if(cameraInfoEntity != null){
+            BeanUtils.copyProperties(cameraInfoEntity, cameraInfo);
+        }
         List<CameraInfo> list = baseMapper.findAllList(cameraInfo);
         List<CameraInfoEntity> listDto = BeanUtil.copyToList(list, CameraInfoEntity.class);
         return listDto;