diff --git a/zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsApiService.java b/zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsApiService.java
index 44bd31ec..e47ee02e 100644
--- a/zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsApiService.java
+++ b/zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsApiService.java
@@ -17,6 +17,13 @@ public interface UpmsApiService {
      */
     List<UpmsPermission> selectUpmsPermissionByUpmsUserId(Integer upmsUserId);
 
+    /**
+     * 根据用户id获取所拥有的权限(用户和角色权限合集)
+     * @param upmsUserId
+     * @return
+     */
+    List<UpmsPermission> selectUpmsPermissionByUpmsUserIdByCache(Integer upmsUserId);
+
     /**
      * 根据用户id获取所属的角色
      * @param upmsUserId
@@ -24,6 +31,13 @@ public interface UpmsApiService {
      */
     List<UpmsRole> selectUpmsRoleByUpmsUserId(Integer upmsUserId);
 
+    /**
+     * 根据用户id获取所属的角色
+     * @param upmsUserId
+     * @return
+     */
+    List<UpmsRole> selectUpmsRoleByUpmsUserIdByCache(Integer upmsUserId);
+
     /**
      * 根据角色id获取所拥有的权限
      * @param upmsRoleId
diff --git a/zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsApiServiceMock.java b/zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsApiServiceMock.java
index 1ac54ac4..820ae91c 100644
--- a/zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsApiServiceMock.java
+++ b/zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsApiServiceMock.java
@@ -20,12 +20,24 @@ public class UpmsApiServiceMock implements UpmsApiService {
         return null;
     }
 
+    @Override
+    public List<UpmsPermission> selectUpmsPermissionByUpmsUserIdByCache(Integer upmsUserId) {
+        _log.info("UpmsApiServiceMock => selectUpmsPermissionByUpmsUserIdByCache");
+        return null;
+    }
+
     @Override
     public List<UpmsRole> selectUpmsRoleByUpmsUserId(Integer upmsUserId) {
         _log.info("UpmsApiServiceMock => selectUpmsRoleByUpmsUserId");
         return null;
     }
 
+    @Override
+    public List<UpmsRole> selectUpmsRoleByUpmsUserIdByCache(Integer upmsUserId) {
+        _log.info("UpmsApiServiceMock => selectUpmsRoleByUpmsUserIdByCache");
+        return null;
+    }
+
     @Override
     public List<UpmsRolePermission> selectUpmsRolePermisstionByUpmsRoleId(Integer upmsRoleId) {
         _log.info("UpmsApiServiceMock => selectUpmsRolePermisstionByUpmsRoleId");
diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsApiServiceImpl.java b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsApiServiceImpl.java
index d2be044b..672377bd 100644
--- a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsApiServiceImpl.java
+++ b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsApiServiceImpl.java
@@ -50,7 +50,6 @@ public class UpmsApiServiceImpl implements UpmsApiService {
      * @return
      */
     @Override
-    @Cacheable(value = "zheng-upms-rpc-service-ehcache", key = "'selectUpmsPermissionByUpmsUserId_' + #upmsUserId")
     public List<UpmsPermission> selectUpmsPermissionByUpmsUserId(Integer upmsUserId) {
         // 用户不存在或锁定状态
         UpmsUser upmsUser = upmsUserMapper.selectByPrimaryKey(upmsUserId);
@@ -62,13 +61,23 @@ public class UpmsApiServiceImpl implements UpmsApiService {
         return upmsPermissions;
     }
 
+    /**
+     * 根据用户id获取所拥有的权限
+     * @param upmsUserId
+     * @return
+     */
+    @Override
+    @Cacheable(value = "zheng-upms-rpc-service-ehcache", key = "'selectUpmsPermissionByUpmsUserId_' + #upmsUserId")
+    public List<UpmsPermission> selectUpmsPermissionByUpmsUserIdByCache(Integer upmsUserId) {
+        return selectUpmsPermissionByUpmsUserId(upmsUserId);
+    }
+
     /**
      * 根据用户id获取所属的角色
      * @param upmsUserId
      * @return
      */
     @Override
-    @Cacheable(value = "zheng-upms-rpc-service-ehcache", key = "'selectUpmsRoleByUpmsUserId_' + #upmsUserId")
     public List<UpmsRole> selectUpmsRoleByUpmsUserId(Integer upmsUserId) {
         // 用户不存在或锁定状态
         UpmsUser upmsUser = upmsUserMapper.selectByPrimaryKey(upmsUserId);
@@ -80,6 +89,17 @@ public class UpmsApiServiceImpl implements UpmsApiService {
         return upmsRoles;
     }
 
+    /**
+     * 根据用户id获取所属的角色
+     * @param upmsUserId
+     * @return
+     */
+    @Override
+    @Cacheable(value = "zheng-upms-rpc-service-ehcache", key = "'selectUpmsRoleByUpmsUserId_' + #upmsUserId")
+    public List<UpmsRole> selectUpmsRoleByUpmsUserIdByCache(Integer upmsUserId) {
+        return selectUpmsRoleByUpmsUserId(upmsUserId);
+    }
+
     /**
      * 根据角色id获取所拥有的权限
      * @param upmsRoleId