xuq

src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -399,10 +399,19 @@ public class UserLogic {
                 waitList.add(waitMap.get(waitUser.getMobile()));
                 continue;
             }
+            User user = userService.lambdaQuery()
+                    .in(User::getMobile, waitUser.getMobile()).last("limit 1")
+                    .one();
+
+            if (user == null )
+                throw new RemoteServiceException("手机号"+waitUser.getMobile()+"未找到用户");
+
             UserServiceWait wait = new UserServiceWait();
             wait.setMobile(waitUser.getMobile())
-                    .setWebsitId(waitUser.getWebsitId())
-                    .setWebsitName(waitUser.getWebsitName())
+                    .setWebsitId(user.getWebsitId())
+                    .setWebsitName(user.getWebsitName())
+                    .setCompanyId(user.getCompanyName())
+                    .setCompanyName(user.getCompanyId())
                     .setPosition(waitUser.getPosition())
                     .setName(waitUser.getWorkName())
                     .setWorkerId(waitUser.getWorkUserId())
@@ -637,8 +646,8 @@ public class UserLogic {
                                                    String position, String mobile, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         return userServiceWaitService.lambdaQuery()
-                .eq(UserServiceWait::getCompanyId, adminUser.getCompanyId())
-                .eq(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),UserServiceWait::getWebsitId, adminUser.getAdminWebsitIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), UserServiceWait::getCompanyId, adminUser.getAdminCompanyIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), UserServiceWait::getWebsitId, adminUser.getAdminWebsitIds())
                 .like(StringUtils.isNotBlank(websitId), UserServiceWait::getWebsitId, websitId)
                 .like(StringUtils.isNotBlank(websitName), UserServiceWait::getWebsitName, websitName)
                 .like(StringUtils.isNotBlank(workUserId), UserServiceWait::getWorkerId, workUserId)