1.用户个人角色接口

hmit-api/src/main/java/io/hmit/dao/UserDao.java

@@ -4,6 +4,7 @@ import io.hmit.common.dao.BaseDao;
 import io.hmit.dto.OrgUserInfoDTO;
 import io.hmit.dto.ServiceUserInfoDTO;
 import io.hmit.entity.UserEntity;
+import io.hmit.modules.serviceOrder.dto.UserRoleInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -28,4 +29,6 @@ public interface UserDao extends BaseDao<UserEntity> {
 
     ServiceUserInfoDTO getServiceUserByUserId(Long userId);
 
+    List<UserRoleInfoDTO> getUserRoleInfo(Long userId);
+
 }

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/UserRoleInfoDTO.java

+package io.hmit.modules.serviceOrder.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Author : Shen Yuanfeng
+ * @Date: 2021/3/19 15:06
+ */
+
+@Data
+@ApiModel(value = "用户角色信息")
+public class UserRoleInfoDTO {
+
+    @ApiModelProperty(value = "角色ID")
+    private String roleId;
+
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
+
+}

hmit-api/src/main/java/io/hmit/service/impl/UserServiceImpl.java

@@ -15,6 +15,7 @@ import io.hmit.dto.ServiceUserInfoDTO;
 import io.hmit.dto.UserInfoDTO;
 import io.hmit.entity.TokenEntity;
 import io.hmit.entity.UserEntity;
+import io.hmit.modules.serviceOrder.dto.UserRoleInfoDTO;
 import io.hmit.modules.serviceOrder.service.PensionOldFamilyService;
 import io.hmit.service.TokenService;
 import io.hmit.service.UserService;
@@ -99,6 +100,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         Map<String, Object> map = new HashMap<>(2);
         map.put("token", tokenEntity.getToken());
         map.put("expire", tokenEntity.getExpireDate().getTime() - System.currentTimeMillis());
+        List<UserRoleInfoDTO> roles = userDao.getUserRoleInfo(user.getId());
+        map.put("roles", roles);
 
         return map;
     }

hmit-api/src/main/resources/mapper/UserDao.xml

@@ -34,4 +34,9 @@
         WHERE tu.id = pou.user_id AND po.id = pou.organization_id AND tu.id = #{userId};
     </select>
 
+    <select id="getUserRoleInfo" resultType="io.hmit.modules.serviceOrder.dto.UserRoleInfoDTO">
+        SELECT tr.id AS roleId, tr.name AS roleName FROM tb_role tr, tb_role_user tru
+        WHERE tru.role_id = tr.id AND tru.user_id = #{userId};
+    </select>
+
 </mapper>
\ No newline at end of file