diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 99f8d91..848ee5e 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -60,7 +60,7 @@
   accessKey: N5YL2gqg3fTByXXI
   secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
-  region: us-east-1
+#  region: us-east-1
 
 xxl:
   job:

diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 99f8d91..848ee5e 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -60,7 +60,7 @@
   accessKey: N5YL2gqg3fTByXXI
   secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
-  region: us-east-1
+#  region: us-east-1
 
 xxl:
   job:
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 2d9f1f5..e88f049 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -67,6 +67,12 @@
             </if>
             <if test="request.certificateStatus != null  and request.certificateStatus != ''">
                 and t1.certificate_status = #{request.certificateStatus}
+                <if test="request.certificateStatus == 0">
+                    and NOW() &lt; t1.valid_date
+                </if>
+                <if test="request.certificateStatus == 1">
+                    and NOW() &gt; t1.valid_date
+                </if>
             </if>
             <if test="request.remindType == 'remind' ">
                 and DATE_FORMAT(t1.valid_date,'%Y-%m-%d') &lt;= DATE_SUB(curdate(),INTERVAL -30 day)

diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 99f8d91..848ee5e 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -60,7 +60,7 @@
   accessKey: N5YL2gqg3fTByXXI
   secretKey: ygOJeueOvLBgi78AG13n201XCoU6Xcze
   bucketName: test
-  region: us-east-1
+#  region: us-east-1
 
 xxl:
   job:
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 2d9f1f5..e88f049 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -67,6 +67,12 @@
             </if>
             <if test="request.certificateStatus != null  and request.certificateStatus != ''">
                 and t1.certificate_status = #{request.certificateStatus}
+                <if test="request.certificateStatus == 0">
+                    and NOW() &lt; t1.valid_date
+                </if>
+                <if test="request.certificateStatus == 1">
+                    and NOW() &gt; t1.valid_date
+                </if>
             </if>
             <if test="request.remindType == 'remind' ">
                 and DATE_FORMAT(t1.valid_date,'%Y-%m-%d') &lt;= DATE_SUB(curdate(),INTERVAL -30 day)
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
index d62fa42..862fc65 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
@@ -318,7 +318,7 @@
             bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION, bean.getEducation()));
             bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB, bean.getTechnologyJob()));
             bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB, bean.getAdministrationJob()));
-            bean.setDeptId(deptMapper.selectById(bean.getDeptId()).getFullName());
+            bean.setDeptName(deptMapper.selectById(bean.getDeptId()).getFullName());
         });
         return meterStaffList;
     }