调整性别数据

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -218,9 +218,7 @@ public class UserController {
     @GetMapping(value = "/current/info")
     @ApiOperation(value = "当前登录用户信息")
     public R info() {
-
-        SaSession tokenSession = StpUtil.getTokenSession();
-        User user = tokenSession.get(GlobalConstant.LOGIN_USER_INFO_KEY, new User());
+        User user = userService.getById(StpUtil.getLoginIdAsLong());
 
         List<Long> roleIds = userRoleRelationService.list(Wrappers.lambdaQuery(UserRoleRelation.class)
                         .eq(UserRoleRelation::getUserId, user.getId()))
@@ -235,6 +233,7 @@ public class UserController {
                 .stream().map(UserPostRelation::getPostId).collect(Collectors.toList());
 
         UserInfoVo vo = BeanUtil.toBean(user, UserInfoVo.class);
+        vo.setGenderCn(GenderDictionaryEnum.getValue(vo.getGender()));
         if (roleIds.size() > 0) {
 
             List<Role> list = roleService.list(Wrappers.lambdaQuery(Role.class).in(Role::getId, roleIds));

src/main/java/com/xjrsoft/module/organization/vo/UserInfoVo.java

@@ -47,7 +47,12 @@ public class UserInfoVo {
     /**
      * 性别
      */
-    private Integer gender;
+    private String gender;
+
+    /**
+     * 性别中文
+     */
+    private String genderCn;
 
     /**
      * 手机号