租户ID为空或0默认羊小咩

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

@@ -204,7 +204,7 @@ public class UserController implements IBaseController {
         // 执行短信验证码检查
         verifyPhoneAndCodeForOnce(phoneNo, verificationCode);
         //默认羊小咩租户
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
         return userService.loginFast(channelId, appChannel, createdFrom, btRegisterChannelId, dimension, clickId, request, merchant, phoneNo, tenantId);
@@ -443,7 +443,7 @@ public class UserController implements IBaseController {
     @RequestMapping("/token")
     public JsonResult token(@RequestParam String token, @RequestParam(required = false) Integer tenantId) {
         //默认羊小咩租户
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
         Map<String, Object> result = new HashMap<>();
@@ -461,7 +461,7 @@ public class UserController implements IBaseController {
         User user = sessionStruct.getValues().getUser();
         //校验非羊小咩租户
         if (!tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
-            if (TenantUtil.validationTenantIdIsNullOrZero(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/internal/user/InnerController.java

@@ -283,7 +283,7 @@ public class InnerController implements IBaseController {
     public JsonResult findByIds(@RequestParam(value = "userIds") String userIdsString, @RequestParam(required = false) Integer tenantId) {
         log.info("批量查询用户的手机号列表, userIdsString:" + userIdsString + ", tenantId:" + tenantId);
         //默认羊小咩租户
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
         if (StringUtils.isEmpty(userIdsString)) {

src/main/java/cn/quantgroup/xyqb/controller/internal/user/center/UserCenterController.java

@@ -63,7 +63,7 @@ public class UserCenterController {
     @PostMapping("/attach/list")
     public JsonResult queryUserAttachList(@RequestBody List<Long> userIds, @RequestParam(required = false) Integer tenantId) {
         //默认羊小咩租户
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
         if (CollectionUtils.isEmpty(userIds)) {

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/user/UserController.java

@@ -96,7 +96,7 @@ public class UserController {
             vals = vals.subList(0,500);
         }
         //默认羊小咩租户
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
         return JsonResult.buildSuccessResultGeneric(userService.findByUuidsOrUserIds(vals, type, tenantId));

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

@@ -40,7 +40,7 @@ public class WxController {
     @GetMapping("/userId/{userId}")
     public JsonResult openId(@PathVariable Long userId, @RequestParam(required = false) Integer tenantId) {
         //默认羊小咩租户
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
         if (tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
@@ -72,7 +72,7 @@ public class WxController {
     @GetMapping("/userId/{userId}/{appName}")
     public JsonResult openId(@PathVariable Long userId,@PathVariable String appName, @RequestParam(required = false) Integer tenantId) {
         //默认羊小咩租户
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
         if (tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
@@ -103,7 +103,7 @@ public class WxController {
      */
     @GetMapping("/phoneNo/{phoneNo}")
     public JsonResult openId(@PathVariable String phoneNo, @RequestParam(required = false) Integer tenantId) {
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
         if (tenantId.equals(TenantUtil.TENANT_DEFAULT)) {

src/main/java/cn/quantgroup/xyqb/service/middleoffice/applet/impl/AppletServiceImpl.java

@@ -105,7 +105,7 @@ public class AppletServiceImpl implements IAppletService {
 
     @Override
     public LoginVo login(String appName, String openId, Integer tenantId, String utmSource) {
-        if (tenantId == null) {
+        if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             tenantId = TenantUtil.TENANT_DEFAULT;
         }
 

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

@@ -52,7 +52,7 @@ public class UserCenterServiceImpl implements UserCenterService {
         if (!tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
             if (userAttacheds != null) {
                 //租户ID校验
-                if (TenantUtil.validationTenantIdIsNullOrZero(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.validationTenantIdIsNullOrZero(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.validationTenantIdIsNullOrZero(tenantId)) {
+        if (!TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
             oauthLoginInfoService.addLoginInfo(user, tenantId);
         }
         LoginProperties loginProperties = new LoginProperties("", 3, channelId, createdFrom, appChannel, merchant.getId(), merchant.getName(), tenantId);
@@ -505,7 +505,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
                     .collect(Collectors.toList());
             List<User> users = userRepository.findByIdIn(collect);
             if (!tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
-                if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
+                if (!TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
                     return tenantService.selectUsersByTenantId(users, tenantId);
                 }
             }
@@ -513,7 +513,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
         } else { //不是1 就是  uuids
             List<User> users = userRepository.findByUuidIn(vals);
             if (!tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
-                if (TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
+                if (!TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
                     return tenantService.selectUsersByTenantId(users, tenantId);
                 }
             }

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

@@ -9,8 +9,8 @@ public class TenantUtil {
     /* 验证租户ID是否为空或0 */
     public static boolean validationTenantIdIsNullOrZero(Integer tenantId) {
         if (tenantId == null || tenantId.equals(0)) {
-            return false;
-        }
             return true;
         }
+        return false;
+    }
 }