test

saas-module/src/main/java/com/makeit/controller/saas/SaasUserController.java

 package com.makeit.controller.saas;
 package com.makeit.controller.saas;
 
 
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.dto.StatusDTO;
 import com.makeit.common.dto.StatusDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageReqDTO;
@@ -10,9 +11,11 @@ import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.global.annotation.Action;
 import com.makeit.global.annotation.Action;
 import com.makeit.module.admin.dto.saas.SaasUserDTOVO;
 import com.makeit.module.admin.dto.saas.SaasUserDTOVO;
 import com.makeit.module.admin.dto.saas.SaasUserQueryDTO;
 import com.makeit.module.admin.dto.saas.SaasUserQueryDTO;
-import com.makeit.service.saas.SaasUserService;
+import com.makeit.module.admin.vo.plat.PlatUserLoginVO;
 import com.makeit.module.admin.vo.saas.SaasUserLoginVO;
 import com.makeit.module.admin.vo.saas.SaasUserLoginVO;
+import com.makeit.service.saas.SaasUserService;
 import com.makeit.utils.user.ThreadLocalUserUtil;
 import com.makeit.utils.user.ThreadLocalUserUtil;
+import com.makeit.utils.user.wechat.WechatUserInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -133,9 +136,15 @@ public class SaasUserController {
 
 
     @ApiOperation("获取当前登录用户的用户信息2")
     @ApiOperation("获取当前登录用户的用户信息2")
     @PostMapping("getUserVOFromTH")
     @PostMapping("getUserVOFromTH")
-    public ApiResponseEntity<SaasUserLoginVO> getUserInfo2(){
+    public ApiResponseEntity<JSONObject> getUserInfo2(){
+        PlatUserLoginVO sysUserLoginVO = ThreadLocalUserUtil.getTntUser();
+        WechatUserInfo wechatUserInfo = ThreadLocalUserUtil.getWechatUser();
         SaasUserLoginVO saasUser = ThreadLocalUserUtil.getSaasUser();
         SaasUserLoginVO saasUser = ThreadLocalUserUtil.getSaasUser();
-        return ApiResponseUtils.success(saasUser);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("sysUserLoginVO",sysUserLoginVO);
+        jsonObject.put("wechatUserInfo",wechatUserInfo);
+        jsonObject.put("saasUser",sysUserLoginVO);
+        return ApiResponseUtils.success(jsonObject);
     }
     }
 
 
 }
 }