小程序登录租户处理

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/applet/AppletController.java

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.controller.middleoffice.applet;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.config.data.WechatConfiguration;
 import cn.quantgroup.xyqb.constant.UserConstant;
+import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.controller.middleoffice.login.ILoginModule;
 import cn.quantgroup.xyqb.controller.middleoffice.login.LoginVo;
 import cn.quantgroup.xyqb.entity.middleoffice.AppletParamEntry;
@@ -30,7 +31,7 @@ import java.util.Arrays;
 @Slf4j
 @RestController
 @RequestMapping("/middle_office/applet")
-public class AppletController {
+public class AppletController implements IBaseController {
 
 	@Value("${applet.appNames:luckii,xyqb,wuxi,yangxiaomie}")
 	private String appletAppNames;
@@ -60,7 +61,7 @@ public class AppletController {
             throw new DataException("appName不合法");
         }
         if(StringUtils.isEmpty(appletParamEntry.getTenantId())){
-            appletParamEntry.setTenantId(UserConstant.defaultTenantId);
+            appletParamEntry.setTenantId(getTenantId());
         }
 
         Long userId = iAppletService.relevance(appletParamEntry);
@@ -81,7 +82,9 @@ public class AppletController {
         if (!containsAppName(appName)) {
             throw new DataException("appName不合法");
         }
-
+        if (tenantId == null) {
+            tenantId = getTenantId();
+        }
         LoginVo login = iAppletService.login(appName, openId, tenantId, utmSource, unionId,appId);
         return JsonResult.buildSuccessResultGeneric(login);
     }