批量根据用户id手机号改造

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -269,15 +269,15 @@ public class InnerController implements IBaseController {
 	 */
     @RequestMapping("/user/getPhoneByUserIds")
     @ApiOperation(httpMethod = "POST", value = "根据用户 ID 批量查询用户信息")
-    public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString) {
-        log.info("批量查询用户的手机号列表, userIdsString:" + userIdsString);
+    public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString, @RequestParam(required = false) Integer tenantId) {
+        log.info("批量查询用户的手机号列表, userIdsString:" + userIdsString + ", tenantId:" + tenantId);
         if (StringUtils.isEmpty(userIdsString)) {
             return JsonResult.buildErrorStateResult(null, null);
         }
         List<Long> userIds = JSONObject.parseObject(userIdsString, new TypeReference<List<Long>>() {
         });
         if (!CollectionUtils.isEmpty(userIds) && userIds.size() <= Constants.USER_ID_BATCH_SIZE) {
-            Map<Long, String> userIdAndPhoneMap = userService.findPhoneByIdsInDb(userIds);
+            Map<Long, String> userIdAndPhoneMap = userService.findPhoneByIdsInDb(userIds, tenantId);
             return JsonResult.buildSuccessResult("", userIdAndPhoneMap);
         } else {
             return JsonResult.buildErrorStateResult("批量查询每次最多进行500条用户信息的查询", null);

src/main/java/cn/quantgroup/xyqb/service/user/IUserService.java

@@ -38,7 +38,7 @@ public interface IUserService {
      */
     String findUuid(String phoneNo, String idNo);
 
-    Map<Long, String> findPhoneByIdsInDb(List<Long> userIds);
+    Map<Long, String> findPhoneByIdsInDb(List<Long> userIds, Integer tenantId);
 
     User saveUser(User user);
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -106,12 +106,16 @@ public class UserServiceImpl implements IUserService, IBaseController {
 
     @Override
     @TargetDataSource(type = DSType.SLAVE)//查询从库
-    public Map<Long, String> findPhoneByIdsInDb(List<Long> userIds) {
+    public Map<Long, String> findPhoneByIdsInDb(List<Long> userIds, Integer tenantId) {
         if (CollectionUtils.isEmpty(userIds)) {
             return Maps.newHashMap();
         }
         Map<Long, String> userIdAndPhoneMap = Maps.newHashMap();
         List<User> users = userRepository.findByIdIn(userIds);
+        //校验租户ID
+        if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+            users = tenantService.selectUsersByTenantId(users, tenantId);
+        }
         users.forEach(user -> userIdAndPhoneMap.put(user.getId(), user.getPhoneNo()));
         return userIdAndPhoneMap;
     }