验证租户是否为空或0

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -459,7 +459,7 @@ public class UserController implements IBaseController {
             return JsonResult.buildSuccessResult(null, result);
         }
         User user = sessionStruct.getValues().getUser();
-        if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             user = tenantService.getTenantUser(user, tenantId);
             if (user == null) {
                 return JsonResult.buildSuccessResult(null, result);

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/wx/WxController.java

@@ -47,7 +47,7 @@ public class WxController {
             return JsonResult.buildSuccessResult();
         }
         /* 校验租户ID */
-        if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             User user = userService.findById(userId);
             user = tenantService.getTenantUser(user, tenantId);
             if (user == null) {
@@ -82,7 +82,7 @@ public class WxController {
             return JsonResult.buildSuccessResult();
         }
         /* 校验租户ID */
-        if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             User user = userService.findByPhoneInDb(phoneNo);
             user = tenantService.getTenantUser(user, tenantId);
             if (user == null) {

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

@@ -51,7 +51,7 @@ public class UserCenterServiceImpl implements UserCenterService {
         List<UserAttached> userAttacheds = userAttachedRepository.findByUserIdIn(userIds);
         if (userAttacheds != null) {
             //租户ID校验
-            if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+            if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
                 List<UserAttached> resultProductUsers = new ArrayList<>();
                 List<User> users = userRepository.findByIdIn(userIds);
                 List<User> productUsers = tenantService.selectUsersByTenantId(users, tenantId);

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

@@ -113,7 +113,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
         Map<Long, String> userIdAndPhoneMap = Maps.newHashMap();
         List<User> users = userRepository.findByIdIn(userIds);
         //校验租户ID
-        if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             users = tenantService.selectUsersByTenantId(users, tenantId);
         }
         users.forEach(user -> userIdAndPhoneMap.put(user.getId(), user.getPhoneNo()));
@@ -389,7 +389,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
             log.info("神策埋点出现问题", e);
         }
         //校验租户ID tenantId
-        if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             oauthLoginInfoService.addLoginInfo(user, tenantId);
         }
         LoginProperties loginProperties = new LoginProperties("", 3, channelId, createdFrom, appChannel, merchant.getId(), merchant.getName(), tenantId);
@@ -504,13 +504,13 @@ public class UserServiceImpl implements IUserService, IBaseController {
                     .map(Long::valueOf)
                     .collect(Collectors.toList());
             List<User> users = userRepository.findByIdIn(collect);
-            if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+            if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
                 return tenantService.selectUsersByTenantId(users, tenantId);
             }
             return users;
         } else { //不是1 就是  uuids
             List<User> users = userRepository.findByUuidIn(vals);
-            if (TenantUtil.checkoutTenantIsDefault(tenantId)) {
+            if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
                 return tenantService.selectUsersByTenantId(users, tenantId);
             }
             return users;

src/main/java/cn/quantgroup/xyqb/util/TenantUtil.java

@@ -6,8 +6,8 @@ public class TenantUtil {
     public static final Integer TENANT_DEFAULT = 560761;
     public static final String TENANT_USER_ERROR = "该租户下未找到此用户";
 
-    /* 租户ID校验是否羊小咩 */
-    public static boolean checkoutTenantIsDefault(Integer tenantId) {
+    /* 验证租户ID是否为空或0 */
+    public static boolean validationTenantIdIsNullOrZero(Integer tenantId) {
         if (tenantId == null || tenantId.equals(0)) {
             return false;
         }