增加默认羊小咩租户判断

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

@@ -24,6 +24,7 @@ import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.session.XyqbSessionContextHolder;
 import cn.quantgroup.xyqb.util.IpUtil;
 import cn.quantgroup.xyqb.util.PasswordUtil;
+import cn.quantgroup.xyqb.util.TenantUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.ApiOperation;
@@ -483,7 +484,7 @@ public class UserController implements IBaseController {
             brief.setPhoneNo(userDetail.getPhoneNo().substring(0, 3) + "****" + userDetail.getPhoneNo().substring(7, 11));
         }
         Integer tenantId = Integer.parseInt(getCurrentTenantIdRedis());
-        if (tenantId != null) {
+        if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) {
             brief = tenantService.getTenantCustomerInfo(userDetail, tenantId);
         }
         return JsonResult.buildSuccessResult(null, brief);

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

@@ -138,7 +138,7 @@ public class InnerController implements IBaseController {
         if (user == null) {
             return JsonResult.buildErrorStateResult("", null);
         }
-        if (tenantId != null) {
+        if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) {
             // userId 查询对应productLogin 获取手机号和customerId
             user = tenantService.getTenantUser(user, tenantId);
             if (user == null ) {
@@ -160,7 +160,7 @@ public class InnerController implements IBaseController {
             return JsonResult.buildErrorStateResult("", null);
         }
 
-        if (tenantId != null) {
+        if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) {
             // userId 查询对应productLogin 获取手机号和customerId
             user = tenantService.getTenantUser(user, tenantId);
             if (user == null ) {
@@ -403,7 +403,7 @@ public class InnerController implements IBaseController {
             return JsonResult.buildErrorStateResult("该用户无实名信息", null);
         }
 
-        if (tenantId != null) {
+        if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) {
             userDetail = tenantService.getTenantUserDetail(userDetail,  tenantId);
             if (userDetail == null) {
                 return JsonResult.buildErrorStateResult("该用户详情信息不存在", null);
@@ -420,7 +420,7 @@ public class InnerController implements IBaseController {
     public JsonResult findUserByUserId(Long userId, Integer tenantId) {
         User user = userService.findById(userId);
         if (user != null) {
-            if (tenantId != null) {
+            if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) {
                 // userId 查询对应productLogin 获取手机号和customerId
                 user = tenantService.getTenantUser(user, tenantId);
                 if (user == null ) {
@@ -442,7 +442,7 @@ public class InnerController implements IBaseController {
         UserDetail userDetail = null;
         userDetail = userDetailService.findSlaveByPhoneNo(phoneNo);
         if (userDetail != null) {
-            if (tenantId != null) {
+            if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) {
                 userDetail = tenantService.getTenantUserDetail(userDetail,  tenantId);
                 if (userDetail == null) {
                     return JsonResult.buildErrorStateResult("该用户详情信息不存在", null);