Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -853,8 +853,16 @@ public class AgreementLogic {
                     websitUser1.setIsOverdue(IsYesNoEnum.NO.getKey());
                 }
 
-                if (remark.split("高空证").length > 0 || remark.split("身份证").length > 0)
+                if ((user.getHightExamineTime() != null && user.getHightExamineTime().before(new Date()))
+                ){
                     websitUser1.setExamineStatus(ExamineWorkerStatusEnum.OVERDUE.getKey());
+                }
+
+                if (( user.getIdCardEndTime() != null && user.getIdCardEndTime().before(new Date()))
+
+                ){
+                    websitUser1.setExamineStatus(ExamineWorkerStatusEnum.OVERDUE.getKey());
+                }
                 websitUser1.updateById();
             }