‘linchangsheng’ 7 달 전
부모
커밋
df46829beb
1개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 8 1
      mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

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

@@ -195,8 +195,15 @@ public class WorkerLogic {
 
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 
+        List<WebsitUser> websitUsers = websitUserService.lambdaQuery().eq(WebsitUser::getUserId, currentCompanyWechat.getUserId()).list();
+
+        List<String> collect = websitUsers.stream().map(WebsitUser::getId).collect(Collectors.toList());
+
+        if (CollectionUtils.isEmpty(collect))
+            return new Page<>();
+
         Page<WorkerPolicy> page = workerPolicyService.lambdaQuery()
-                .eq(WorkerPolicy::getWorkerId,currentCompanyWechat.getUserId())
+                .eq(WorkerPolicy::getWebsitUserId,collect)
                 .eq(WorkerPolicy::getPolicyType,"AC")
                 .eq(WorkerPolicy::getType,"IN")
                 .page(new Page<>(pageNum, pageSize));