diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java
new file mode 100644
index 0000000000..75340b75c5
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName UserRoleFormDTO
+ * @Author wangc
+ * @date 2020.03.30 15:26
+ */
+@Data
+public class UserRoleFormDTO implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    @NotBlank(message = "用户Id不能为空")
+    private String userId;
+
+    @NotBlank(message = "客户Id不能为空")
+    private String customerId;
+
+    @NotBlank(message = "用户来源app不能为空")
+    private String app;
+
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java
new file mode 100644
index 0000000000..11de4ed8c2
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java
@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName UserRoleResultDTO
+ * @Author wangc
+ * @date 2020.03.30 15:29
+ */
+@Data
+public class UserRoleResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色名称
+     * */
+    private String roleName;
+
+    /**
+     * 角色key值:normal_resi 、normal_resi 、 normal_resi
+     * */
+    private String roleKey;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
index 8abd9cb961..9ad160716a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.UserRoleDTO;
+import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.excel.UserRoleExcel;
 import com.epmet.service.UserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,19 @@ public class UserRoleController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserRoleExcel.class);
     }
 
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    @PostMapping("getuserroleinfo")
+    public Result<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO){
+
+        ValidatorUtils.validateEntity(userRoleFormDTO);
+
+        return userRoleService.getUserRoleInfo(userRoleFormDTO);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
index ca82e9ae48..0fac9314a9 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
@@ -18,9 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用户角色关系表 
  *
@@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserRoleDao extends BaseDao<UserRoleEntity> {
-	
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    List<UserRoleResultDTO> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java
index 877c2d0f52..525eda15a3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java
@@ -19,7 +19,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserRoleDTO;
+import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 
 import java.util.List;
@@ -92,4 +95,14 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java
index 28508b6652..c3926f71d0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java
@@ -23,8 +23,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.UserRoleDao;
 import com.epmet.dto.UserRoleDTO;
+import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 import com.epmet.redis.UserRoleRedis;
 import com.epmet.service.UserRoleService;
@@ -101,4 +104,16 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    @Override
+    public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
+        return new Result<List<UserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
index 7ea5756844..5e8221dd5d 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
@@ -17,4 +17,27 @@
     </resultMap>
 
 
+
+    <select id="getUserRoleInfo" parameterType="com.epmet.dto.form.UserRoleFormDTO" resultType="com.epmet.dto.result.UserRoleResultDTO" >
+
+    SELECT
+        er.ROLE_NAME,
+        er.ROLE_KEY
+    FROM
+        USER_ROLE ur
+        JOIN EPMET_ROLE er ON ur.ROLE_ID = er.ID
+
+    WHERE
+        er.APP = #{app}
+    AND
+        ur.CUSTOMER_ID = #{customerId}
+    AND
+        ur.USER_ID = #{userId}
+    AND
+        er.DEL_FLAG = 0
+    AND
+        ur.DEL_FLAG = 0
+
+    </select>
+
 </mapper>
\ No newline at end of file