需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -71,6 +71,9 @@ public class WorkerLogic {
     @Autowired
     AgreementPolicyService agreementPolicyService;
 
+    @Autowired
+    MailboxService mailboxService;
+
 
 
     public List<WorkerRemind> remind() {
@@ -443,6 +446,7 @@ public class WorkerLogic {
     }
 
     public List<AdminWebsit> myWebsit() {
+        Mailbox mailbox = mailboxService.getById("1");
 
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 
@@ -453,7 +457,12 @@ public class WorkerLogic {
         for (WebsitUser websitUser : websitUsers) {
             if (workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .eq(WorkerPolicy::getPolicyType,"AC")
-                    .in(WorkerPolicy::getStatus,"BZZ","DSX").count() < 1) {
+                    .in(WorkerPolicy::getStatus,"BZZ","DSX").count() < 1 ||
+                    workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                            .eq(WorkerPolicy::getPolicyType,"AC")
+                            .in(WorkerPolicy::getStatus,"BZZ","DSX")
+                            .le(WorkerPolicy::getEndTime,DateUtil.endOfDay(DateUtil.offsetDay(new Date(),mailbox.getOverNum())))
+                            .count() > 0) {
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
                 adminWebsits.add(adminWebsit);
             }