diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index 2b653dc220..9686f28e58 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -574,5 +574,5 @@ public interface EpmetUserOpenFeignClient {
      * @date 2021/6/15 3:03 下午
      */
     @PostMapping("/epmetuser/staffrole/getroles")
-    Result<List<CustomerAgencyUserRoleDTO>> getRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO);
+    Result<List<CustomerAgencyUserRoleDTO>> getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO);
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
index 26f53bfea3..a10545a10d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
@@ -395,8 +395,8 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<List<CustomerAgencyUserRoleDTO>> getRoles(CustomerAgencyUserRoleFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRoles", formDTO);
+    public Result<List<CustomerAgencyUserRoleDTO>> getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoles", formDTO);
     }
 
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
index 14ec76b364..08a5041dc5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java
@@ -210,8 +210,8 @@ public class StaffRoleController {
      * @date 2021/6/15 3:03 下午
      */
     @PostMapping("getroles")
-    public Result<List<CustomerAgencyUserRoleDTO>> getRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO){
+    public Result<List<CustomerAgencyUserRoleDTO>> getUserRoles(@RequestBody CustomerAgencyUserRoleFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, CustomerAgencyUserRoleFormDTO.CustomerAgencyUserRoleForm.class);
-        return new Result<List<CustomerAgencyUserRoleDTO>>().ok(staffRoleService.getRoles(formDTO));
+        return new Result<List<CustomerAgencyUserRoleDTO>>().ok(staffRoleService.getUserRoles(formDTO));
     }
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java
index 283358cbaa..ceb070f3ad 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffRoleService.java
@@ -173,5 +173,5 @@ public interface StaffRoleService extends BaseService<StaffRoleEntity> {
      * @author zxc
      * @date 2021/6/15 3:03 下午
      */
-    List<CustomerAgencyUserRoleDTO> getRoles(CustomerAgencyUserRoleFormDTO formDTO);
+    List<CustomerAgencyUserRoleDTO> getUserRoles(CustomerAgencyUserRoleFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
index e268a87364..3ee5e72bb3 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
@@ -211,7 +211,7 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
      * @date 2021/6/15 3:03 下午
      */
     @Override
-    public List<CustomerAgencyUserRoleDTO> getRoles(CustomerAgencyUserRoleFormDTO formDTO) {
+    public List<CustomerAgencyUserRoleDTO> getUserRoles(CustomerAgencyUserRoleFormDTO formDTO) {
         List<CustomerAgencyUserRoleDTO> result = new ArrayList<>();
         List<String> disUserIds = new ArrayList<>();
         if (!CollectionUtils.isEmpty(formDTO.getStaffIds())){