Wang-Xiao-Ran il y a 1 an
Parent
commit
fa02aac363

+ 9 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -304,4 +304,13 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+
+    /**
+     * 查询微信用户信息
+     */
+    @GetMapping("/getWxUserInfo/{userId}")
+    public AjaxResult getWxUserInfo(@PathVariable("userId")String userId){
+        return AjaxResult.success(userService.getWxUserInfo(userId));
+    }
 }

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -119,7 +119,7 @@ public class SysLoginService
         String token = wxtokenService.createToken(loginUser);
         Map<String, String> resultMap = new HashMap<>();
         resultMap.put(Constants.TOKEN, token);
-        resultMap.put("userId", SecurityUtils.getUserId().toString());
+        resultMap.put("userId", user.getId().toString());
         return resultMap;
     }
     /**

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -2,9 +2,11 @@ package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.WxUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户表 数据层
@@ -130,4 +132,6 @@ public interface SysUserMapper extends BaseMapper<SysUser>
     List<SysUser> selectCodeAndName(SysUser sysUser);
 
     List<SysUser> listAll(SysUser user);
+
+    Map<String,Object> getWxUserInfo(String userId);
 }

+ 5 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -2,8 +2,10 @@ package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.WxUser;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户 业务层
@@ -211,4 +213,7 @@ public interface ISysUserService extends IService<SysUser>
     List<SysUser> selectCodeAndName();
 
     List<SysUser> listAll(SysUser user);
+
+
+    Map<String,Object> getWxUserInfo(String userId);
 }

+ 6 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.WxUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -27,6 +28,7 @@ import org.springframework.util.CollectionUtils;
 import javax.validation.Validator;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -568,4 +570,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return userMapper.listAll(user);
     }
 
+    @Override
+    public Map<String,Object> getWxUserInfo(String userId) {
+        return userMapper.getWxUserInfo(userId);
+    }
 }

+ 7 - 0
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -238,4 +238,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
  	</delete>
 
+	<select id="getWxUserInfo" parameterType="string" resultType="map">
+		select
+			wechat_name as wechatName,
+			name as name,
+			head_img as headImg
+		from jnb_wx_user where id = #{userId}
+	</select>
 </mapper>